|
[-]
[+]
|
Changed |
kdeclarative.spec
|
|
|
|
[-]
[+]
|
Changed |
kdeclarative-5.10.0.tar.xz/CMakeLists.txt
^
|
| @@ -3,12 +3,12 @@
project(KDeclarative)
# Dependencies
-find_package(ECM 5.9.0 REQUIRED NO_MODULE)
+find_package(ECM 5.10.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
set(REQUIRED_QT_VERSION "5.2.0")
-set(KF5_VERSION "5.9.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.9.0") # handled by release scripts
+set(KF5_VERSION "5.10.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.10.0") # handled by release scripts
find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Qml Quick Gui)
include(KDEInstallDirs)
|
|
[-]
[+]
|
Changed |
kdeclarative-5.10.0.tar.xz/cmake/Findepoxy.cmake
^
|
| @@ -8,8 +8,29 @@
# Copyright (c) 2014 Fredrik Höglund <fredrik@kde.org>
#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. Neither the name of the University nor the names of its contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
if (NOT WIN32)
find_package(PkgConfig)
|
|
[-]
[+]
|
Changed |
kdeclarative-5.10.0.tar.xz/src/kpackagelauncherqml/main.cpp
^
|
| @@ -65,6 +65,10 @@
obj.setTranslationDomain(packagePath);
obj.setInitializationDelayed(true);
obj.loadPackage(packagePath);
+ if (!obj.package().isValid()) {
+ qWarning() << "The specified Application package is not valid.";
+ return 1;
+ }
obj.engine()->rootContext()->setContextProperty("commandlineArguments", parser.positionalArguments());
obj.completeInitialization();
|
|
[-]
[+]
|
Changed |
kdeclarative-5.10.0.tar.xz/src/qmlcontrols/draganddrop/DeclarativeDropArea.cpp
^
|
| @@ -67,6 +67,8 @@
temporaryInhibitParent(true);
}
+ m_oldDragMovePos = event->pos();
+
emit dragEnter(&dde);
setContainsDrag(true);
}
@@ -77,6 +79,7 @@
//was changed while drag
temporaryInhibitParent(false);
+ m_oldDragMovePos = QPoint(-1,-1);
DeclarativeDragDropEvent dde(event, this);
emit dragLeave(&dde);
setContainsDrag(false);
@@ -88,6 +91,13 @@
return;
}
+ //if the position we export didn't change, don't generate the move event
+ if (event->pos() == m_oldDragMovePos) {
+ event->setAccepted(false);
+ return;
+ }
+
+ m_oldDragMovePos = event->pos();
DeclarativeDragDropEvent dde(event, this);
event->accept();
emit dragMove(&dde);
@@ -100,6 +110,8 @@
//so the parent dropevent doesn't get delivered
metaObject()->invokeMethod(this, "temporaryInhibitParent", Qt::QueuedConnection, Q_ARG(bool, false));
+ m_oldDragMovePos = QPoint(-1,-1);
+
if (!m_enabled || m_temporaryInhibition) {
return;
}
|
|
[-]
[+]
|
Changed |
kdeclarative-5.10.0.tar.xz/src/qmlcontrols/draganddrop/DeclarativeDropArea.h
^
|
| @@ -105,6 +105,7 @@
bool m_preventStealing : 1;
bool m_temporaryInhibition : 1;
bool m_containsDrag : 1;
+ QPoint m_oldDragMovePos;
};
#endif
|
|
[-]
[+]
|
Changed |
kdeclarative-5.10.0.tar.xz/src/qmlcontrols/kcoreaddons/kuserproxy.h
^
|
| @@ -89,7 +89,7 @@
/**
* @return the url of the user's configured image (including file:/)
- * @see nameChanged
+ * @see faceIconUrlChanged
*/
QUrl faceIconUrl() const;
@@ -114,7 +114,7 @@
void nameChanged();
/**
* signal that the user image changed
- * @see faceIconPath
+ * @see faceIconUrl
*/
void faceIconUrlChanged();
|
|
[-]
[+]
|
Changed |
kdeclarative-5.10.0.tar.xz/src/qmlcontrols/kquickcontrolsaddons/clipboard.h
^
|
| @@ -32,17 +32,17 @@
/**
* Controls the state this object will be monitoring and extracting its contents from.
*/
- Q_PROPERTY(QClipboard::Mode mode READ mode WRITE setMode NOTIFY modeChanged);
+ Q_PROPERTY(QClipboard::Mode mode READ mode WRITE setMode NOTIFY modeChanged)
/**
* Provides the contents currently in the clipboard and lets modify them.
*/
- Q_PROPERTY(QVariant content READ content WRITE setContent NOTIFY contentChanged);
+ Q_PROPERTY(QVariant content READ content WRITE setContent NOTIFY contentChanged)
/**
* Figure out the nature of the contents in the clipboard.
*/
- Q_PROPERTY(QStringList formats READ formats NOTIFY contentChanged);
+ Q_PROPERTY(QStringList formats READ formats NOTIFY contentChanged)
public:
explicit Clipboard(QObject* parent = 0);
|
|
[-]
[+]
|
Changed |
kdeclarative-5.10.0.tar.xz/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp
^
|
| @@ -258,10 +258,11 @@
//the parent will receive events in its own coordinates
const QPointF myPos = item->mapToItem(this, me->pos());
+
KDeclarativeMouseEvent dme(myPos.x(), myPos.y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos()));
- if (!m_pressAndHoldEvent) {
- m_pressAndHoldEvent = new KDeclarativeMouseEvent(myPos.x(), myPos.y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos()));
- }
+ delete m_pressAndHoldEvent;
+ m_pressAndHoldEvent = new KDeclarativeMouseEvent(myPos.x(), myPos.y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos()));
+
//qDebug() << "pressed in sceneEventFilter";
m_buttonDownPos[me->button()] = me->pos();
emit pressed(&dme);
|
|
[-]
[+]
|
Changed |
kdeclarative-5.10.0.tar.xz/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp
^
|
| @@ -709,7 +709,9 @@
// Delete the VBO
glDeleteBuffers(1, &vbo);
- window()->update();
+ if (window()) {
+ window()->update();
+ }
}
QSGNode *Plotter::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData)
|
|
[-]
[+]
|
Changed |
kdeclarative-5.10.0.tar.xz/src/qmlcontrols/kquickcontrolsaddons/plotter.h
^
|
| @@ -237,6 +237,7 @@
qreal m_rangeMax;
qreal m_rangeMin;
int m_sampleSize;
+ int m_horizontalLineCount;
bool m_stacked;
bool m_autoRange;
QColor m_gridColor;
@@ -248,7 +249,6 @@
bool m_haveInternalFormatQuery;
GLenum m_internalFormat;
int m_samples;
- int m_horizontalLineCount;
QPointer <QQuickWindow> m_window;
QMutex m_mutex;
|
|
[-]
[+]
|
Changed |
kdeclarative-5.10.0.tar.xz/tests/helloworld/metadata.desktop
^
|
| @@ -11,6 +11,9 @@
Name[fi]=hei maailma
Name[gl]=Ola, mundo!
Name[he]=שלום עולם
+Name[it]=ciao mondo
+Name[ko]=hello world
+Name[nb]=hallo verden
Name[nl]=hallo wereld
Name[pl]=witaj świecie
Name[pt]=olá mundo
@@ -26,8 +29,9 @@
Name[uk]=Привіт, світе
Name[x-test]=xxhello worldxx
Name[zh_CN]=你好世界
-Type=Service
+Type=Application
Icon=package_toys
+Exec=kpackagelauncherqml -a org.kde.example.helloworld
X-KDE-ParentApp=
X-KDE-PluginInfo-Author=Marco Martin
X-KDE-PluginInfo-Category=Miscellaneous
@@ -36,7 +40,7 @@
X-KDE-PluginInfo-Name=org.kde.example.helloworld
X-KDE-PluginInfo-Version=
X-KDE-PluginInfo-Website=
-X-KDE-ServiceTypes=KPackage/Generic
+X-KDE-ServiceTypes=KPackage/GenericQML
X-Plasma-MainScript=ui/main.qml
X-Plasma-RemoteLocation=
|
|
[-]
[+]
|
Changed |
kdeclarative-5.10.0.tar.xz/tests/helloworldnowindow/metadata.desktop
^
|
| @@ -11,6 +11,9 @@
Name[fi]=hei maailma
Name[gl]=Ola, mundo!
Name[he]=שלום עולם
+Name[it]=ciao mondo
+Name[ko]=hello world
+Name[nb]=hallo verden
Name[nl]=hallo wereld
Name[pl]=witaj świecie
Name[pt]=olá mundo
@@ -26,8 +29,9 @@
Name[uk]=Привіт, світе
Name[x-test]=xxhello worldxx
Name[zh_CN]=你好世界
-Type=Service
+Type=Application
Icon=package_toys
+Exec=kpackagelauncherqml -a org.kde.example.helloworldnowindow
X-KDE-ParentApp=
X-KDE-PluginInfo-Author=Marco Martin
X-KDE-PluginInfo-Category=Miscellaneous
@@ -36,7 +40,7 @@
X-KDE-PluginInfo-Name=org.kde.example.helloworldnowindow
X-KDE-PluginInfo-Version=
X-KDE-PluginInfo-Website=
-X-KDE-ServiceTypes=KPackage/Generic
+X-KDE-ServiceTypes=KPackage/GenericQML
X-Plasma-MainScript=ui/main.qml
X-Plasma-RemoteLocation=
|
|
[-]
[+]
|
Changed |
kdeclarative.yaml
^
|
| @@ -1,5 +1,5 @@
Name : kdeclarative
-Version : 5.9.0
+Version : 5.10.0
Release : 1
Group : System/Base
License : GPLv2+
|
