Hello community, here is the log from the commit of package kdeclarative for openSUSE:Factory checked in at 2015-05-11 19:36:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeclarative (Old) and /work/SRC/openSUSE:Factory/.kdeclarative.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdeclarative" Changes: -------- --- /work/SRC/openSUSE:Factory/kdeclarative/kdeclarative.changes 2015-04-13 20:26:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdeclarative.new/kdeclarative.changes 2015-05-11 19:48:13.000000000 +0200 @@ -1,0 +2,8 @@ +Sun May 3 19:48:29 UTC 2015 - [email protected] + +- Update to 5.10.0 + * Fix crash in texture cache + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.10.0.php + +------------------------------------------------------------------- Old: ---- kdeclarative-5.9.0.tar.xz New: ---- kdeclarative-5.10.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeclarative.spec ++++++ --- /var/tmp/diff_new_pack.PcuPqf/_old 2015-05-11 19:48:14.000000000 +0200 +++ /var/tmp/diff_new_pack.PcuPqf/_new 2015-05-11 19:48:14.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5Declarative5 -%define _tar_path 5.9 +%define _tar_path 5.10 Name: kdeclarative -Version: 5.9.0 +Version: 5.10.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 ++++++ kdeclarative-5.9.0.tar.xz -> kdeclarative-5.10.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.9.0/CMakeLists.txt new/kdeclarative-5.10.0/CMakeLists.txt --- old/kdeclarative-5.9.0/CMakeLists.txt 2015-04-04 14:02:53.000000000 +0200 +++ new/kdeclarative-5.10.0/CMakeLists.txt 2015-05-03 17:08:09.000000000 +0200 @@ -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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.9.0/cmake/Findepoxy.cmake new/kdeclarative-5.10.0/cmake/Findepoxy.cmake --- old/kdeclarative-5.9.0/cmake/Findepoxy.cmake 2015-04-04 14:02:53.000000000 +0200 +++ new/kdeclarative-5.10.0/cmake/Findepoxy.cmake 2015-05-03 17:08:09.000000000 +0200 @@ -8,8 +8,29 @@ # Copyright (c) 2014 Fredrik Höglund <[email protected]> # -# 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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.9.0/po/ast/kdeclarative5.po new/kdeclarative-5.10.0/po/ast/kdeclarative5.po --- old/kdeclarative-5.9.0/po/ast/kdeclarative5.po 2015-04-04 14:02:53.000000000 +0200 +++ new/kdeclarative-5.10.0/po/ast/kdeclarative5.po 2015-05-03 17:08:09.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: kdelibs4-1\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-03-05 09:24+0000\n" -"PO-Revision-Date: 2015-02-27 23:35+0100\n" +"PO-Revision-Date: 2015-04-06 14:25+0100\n" "Last-Translator: enolp <[email protected]>\n" "Language-Team: Asturian <[email protected]>\n" "Language: ast\n" @@ -18,10 +18,12 @@ "X-Poedit-Language: asturian\n" "X-Generator: Lokalize 2.0\n" +#, fuzzy msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "Iñigo Varela" +#, fuzzy msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "[email protected]" @@ -58,11 +60,12 @@ msgstr "" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:332 +#, fuzzy msgid "Conflict with Standard Application Shortcut" msgstr "Conflictu col atayu de l'aplicación estándar" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:333 -#, kde-format +#, fuzzy, kde-format msgid "" "The '%1' key combination is also used for the standard action \"%2\" that " "some applications use.\n" @@ -73,15 +76,18 @@ "¿De xuru que quies tamién usala como atayu global?" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:338 +#, fuzzy msgid "Reassign" msgstr "Reasignar" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:378 +#, fuzzy msgctxt "What the user inputs now will be taken as the new shortcut" msgid "Input" msgstr "Entrada" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:385 +#, fuzzy msgctxt "No shortcut defined" msgid "None" msgstr "Dengún" @@ -92,5 +98,6 @@ msgstr "La tecla qu'acabes primir nun ta sofitada per Qt." #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:407 +#, fuzzy msgid "Unsupported Key" msgstr "Tecla non sofitada" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.9.0/po/cs/kdeclarative5.po new/kdeclarative-5.10.0/po/cs/kdeclarative5.po --- old/kdeclarative-5.9.0/po/cs/kdeclarative5.po 2015-04-04 14:02:53.000000000 +0200 +++ new/kdeclarative-5.10.0/po/cs/kdeclarative5.po 2015-05-03 17:08:09.000000000 +0200 @@ -9,33 +9,33 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-03-05 09:24+0000\n" -"PO-Revision-Date: 2015-01-15 15:09+0100\n" +"PO-Revision-Date: 2015-04-16 09:48+0100\n" "Last-Translator: Vít Pelčák <[email protected]>\n" -"Language-Team: American English <[email protected]>\n" +"Language-Team: Czech <[email protected]>\n" "Language: en_US\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "X-Language: cs_CZ\n" "X-Source-Language: en_US\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "" +msgstr "Vít Pelčák" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "" +msgstr "[email protected]" #: kpackagelauncherqml/main.cpp:42 msgid "KPackage QML application shell" -msgstr "" +msgstr "Shell aplikace KPackage QML" #: kpackagelauncherqml/main.cpp:50 msgid "The unique name of the application (mandatory)" -msgstr "" +msgstr "Unikátní název aplikace (povinné)" #: qmlcontrols/kquickcontrols/KeySequenceItem.qml:38 msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.9.0/po/da/kdeclarative5.po new/kdeclarative-5.10.0/po/da/kdeclarative5.po --- old/kdeclarative-5.9.0/po/da/kdeclarative5.po 2015-04-04 14:02:53.000000000 +0200 +++ new/kdeclarative-5.10.0/po/da/kdeclarative5.po 2015-05-03 17:08:09.000000000 +0200 @@ -4,14 +4,14 @@ # # Martin Schlander, 2008. # Martin Schlander <[email protected]>, 2008. -# Martin Schlander <[email protected]>, 2008, 2009, 2010, 2011, 2012, 2013, 2014. +# Martin Schlander <[email protected]>, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. # Keld Simonsen <[email protected]>, 2010. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-03-05 09:24+0000\n" -"PO-Revision-Date: 2014-09-21 15:29+0200\n" +"PO-Revision-Date: 2015-04-25 15:05+0200\n" "Last-Translator: Martin Schlander <[email protected]>\n" "Language-Team: Danish <[email protected]>\n" "Language: da\n" @@ -31,13 +31,11 @@ #: kpackagelauncherqml/main.cpp:42 msgid "KPackage QML application shell" -msgstr "" +msgstr "KPackage skal til QML-programmer" #: kpackagelauncherqml/main.cpp:50 -#, fuzzy -#| msgid "defines the application font" msgid "The unique name of the application (mandatory)" -msgstr "definerer programmets skrifttype" +msgstr "Programmets unikke navn (obligatorisk)" #: qmlcontrols/kquickcontrols/KeySequenceItem.qml:38 msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.9.0/po/ko/kdeclarative5.po new/kdeclarative-5.10.0/po/ko/kdeclarative5.po --- old/kdeclarative-5.9.0/po/ko/kdeclarative5.po 2015-04-04 14:02:53.000000000 +0200 +++ new/kdeclarative-5.10.0/po/ko/kdeclarative5.po 2015-05-03 17:08:09.000000000 +0200 @@ -1,15 +1,16 @@ # Korean messages for kdelibs. # Copyright (C) Free Software Foundation, Inc. # Cho Sung Jae <[email protected]>, 2007. -# Park Shinjo <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. +# Shinjo Park <[email protected]>, 2007, 2008, 2009, 2010, 2011. +# Shinjo Park <[email protected]>, 2011, 2012, 2013, 2014, 2015. # msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-03-05 09:24+0000\n" -"PO-Revision-Date: 2015-01-18 17:06+0900\n" -"Last-Translator: Park Shinjo <[email protected]>\n" +"PO-Revision-Date: 2015-04-26 17:51+0200\n" +"Last-Translator: Shinjo Park <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -20,19 +21,19 @@ msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "" +msgstr "Shinjo Park" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "" +msgstr "[email protected]" #: kpackagelauncherqml/main.cpp:42 msgid "KPackage QML application shell" -msgstr "" +msgstr "KPackage QML 프로그램 셸" #: kpackagelauncherqml/main.cpp:50 msgid "The unique name of the application (mandatory)" -msgstr "" +msgstr "프로그램의 식별 가능한 이름(필수)" #: qmlcontrols/kquickcontrols/KeySequenceItem.qml:38 msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.9.0/po/nb/kdeclarative5.po new/kdeclarative-5.10.0/po/nb/kdeclarative5.po --- old/kdeclarative-5.9.0/po/nb/kdeclarative5.po 2015-04-04 14:02:53.000000000 +0200 +++ new/kdeclarative-5.10.0/po/nb/kdeclarative5.po 2015-05-03 17:08:09.000000000 +0200 @@ -1,7 +1,7 @@ # Translation of kdeclarative5 to Norwegian Bokmål # # Knut Yrvin <[email protected]>, 2002, 2003, 2004, 2005. -# Bjørn Steensrud <[email protected]>, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. +# Bjørn Steensrud <[email protected]>, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. # Eskild Hustvedt <[email protected]>, 2004, 2005. # Gaute Hvoslef Kvalnes <[email protected]>, 2004, 2005. # Axel Bojer <[email protected]>, 2005, 2006. @@ -12,7 +12,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-03-05 09:24+0000\n" -"PO-Revision-Date: 2014-11-05 13:40+0100\n" +"PO-Revision-Date: 2015-04-28 08:55+0200\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" "Language: nb\n" @@ -27,19 +27,19 @@ msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "" +msgstr "Bjørn Steensrud" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "" +msgstr "[email protected]" #: kpackagelauncherqml/main.cpp:42 msgid "KPackage QML application shell" -msgstr "" +msgstr "KPackage QML programskall" #: kpackagelauncherqml/main.cpp:50 msgid "The unique name of the application (mandatory)" -msgstr "" +msgstr "Det entydige navnet på programmet (obligatorisk)" #: qmlcontrols/kquickcontrols/KeySequenceItem.qml:38 msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.9.0/src/kpackagelauncherqml/main.cpp new/kdeclarative-5.10.0/src/kpackagelauncherqml/main.cpp --- old/kdeclarative-5.9.0/src/kpackagelauncherqml/main.cpp 2015-04-04 14:02:53.000000000 +0200 +++ new/kdeclarative-5.10.0/src/kpackagelauncherqml/main.cpp 2015-05-03 17:08:09.000000000 +0200 @@ -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(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.9.0/src/qmlcontrols/draganddrop/DeclarativeDropArea.cpp new/kdeclarative-5.10.0/src/qmlcontrols/draganddrop/DeclarativeDropArea.cpp --- old/kdeclarative-5.9.0/src/qmlcontrols/draganddrop/DeclarativeDropArea.cpp 2015-04-04 14:02:53.000000000 +0200 +++ new/kdeclarative-5.10.0/src/qmlcontrols/draganddrop/DeclarativeDropArea.cpp 2015-05-03 17:08:09.000000000 +0200 @@ -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; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.9.0/src/qmlcontrols/draganddrop/DeclarativeDropArea.h new/kdeclarative-5.10.0/src/qmlcontrols/draganddrop/DeclarativeDropArea.h --- old/kdeclarative-5.9.0/src/qmlcontrols/draganddrop/DeclarativeDropArea.h 2015-04-04 14:02:53.000000000 +0200 +++ new/kdeclarative-5.10.0/src/qmlcontrols/draganddrop/DeclarativeDropArea.h 2015-05-03 17:08:09.000000000 +0200 @@ -105,6 +105,7 @@ bool m_preventStealing : 1; bool m_temporaryInhibition : 1; bool m_containsDrag : 1; + QPoint m_oldDragMovePos; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.9.0/src/qmlcontrols/kcoreaddons/kuserproxy.h new/kdeclarative-5.10.0/src/qmlcontrols/kcoreaddons/kuserproxy.h --- old/kdeclarative-5.9.0/src/qmlcontrols/kcoreaddons/kuserproxy.h 2015-04-04 14:02:53.000000000 +0200 +++ new/kdeclarative-5.10.0/src/qmlcontrols/kcoreaddons/kuserproxy.h 2015-05-03 17:08:09.000000000 +0200 @@ -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(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.9.0/src/qmlcontrols/kquickcontrolsaddons/clipboard.h new/kdeclarative-5.10.0/src/qmlcontrols/kquickcontrolsaddons/clipboard.h --- old/kdeclarative-5.9.0/src/qmlcontrols/kquickcontrolsaddons/clipboard.h 2015-04-04 14:02:53.000000000 +0200 +++ new/kdeclarative-5.10.0/src/qmlcontrols/kquickcontrolsaddons/clipboard.h 2015-05-03 17:08:09.000000000 +0200 @@ -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); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.9.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp new/kdeclarative-5.10.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp --- old/kdeclarative-5.9.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp 2015-04-04 14:02:53.000000000 +0200 +++ new/kdeclarative-5.10.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp 2015-05-03 17:08:09.000000000 +0200 @@ -166,6 +166,7 @@ if (!m_pressAndHoldEvent) { m_pressAndHoldEvent = new KDeclarativeMouseEvent(me->pos().x(), me->pos().y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers(), screenForGlobalPos(me->globalPos())); } + emit pressed(&dme); m_pressed = true; emit pressedChanged(); @@ -241,6 +242,11 @@ return false; } + //don't filter other mouseeventlisteners + if (qobject_cast<MouseEventListener *>(item)) { + return false; + } + switch (event->type()) { case QEvent::MouseButtonPress: { m_lastEvent = event; @@ -252,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); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.9.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp new/kdeclarative-5.10.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp --- old/kdeclarative-5.9.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp 2015-04-04 14:02:53.000000000 +0200 +++ new/kdeclarative-5.10.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp 2015-05-03 17:08:09.000000000 +0200 @@ -709,7 +709,9 @@ // Delete the VBO glDeleteBuffers(1, &vbo); - window()->update(); + if (window()) { + window()->update(); + } } QSGNode *Plotter::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.9.0/src/qmlcontrols/kquickcontrolsaddons/plotter.h new/kdeclarative-5.10.0/src/qmlcontrols/kquickcontrolsaddons/plotter.h --- old/kdeclarative-5.9.0/src/qmlcontrols/kquickcontrolsaddons/plotter.h 2015-04-04 14:02:53.000000000 +0200 +++ new/kdeclarative-5.10.0/src/qmlcontrols/kquickcontrolsaddons/plotter.h 2015-05-03 17:08:09.000000000 +0200 @@ -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; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.9.0/src/quickaddons/imagetexturescache.cpp new/kdeclarative-5.10.0/src/quickaddons/imagetexturescache.cpp --- old/kdeclarative-5.9.0/src/quickaddons/imagetexturescache.cpp 2015-04-04 14:02:53.000000000 +0200 +++ new/kdeclarative-5.10.0/src/quickaddons/imagetexturescache.cpp 2015-05-03 17:08:09.000000000 +0200 @@ -55,9 +55,10 @@ } //if we have a cache in an atlas but our request cannot use an atlassed texture - //return a non atlassed copy + //create a new texture and use that + //don't use removedFromAtlas() as that requires keeping a reference to the non atlased version if (!(options & QQuickWindow::TextureCanUseAtlas) && texture->isAtlasTexture()) { - texture = QSharedPointer<QSGTexture>(texture->removedFromAtlas()); + texture = QSharedPointer<QSGTexture>(window->createTextureFromImage(image, options)); } return texture; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.9.0/tests/helloworld/metadata.desktop new/kdeclarative-5.10.0/tests/helloworld/metadata.desktop --- old/kdeclarative-5.9.0/tests/helloworld/metadata.desktop 2015-04-04 14:02:53.000000000 +0200 +++ new/kdeclarative-5.10.0/tests/helloworld/metadata.desktop 2015-05-03 17:08:09.000000000 +0200 @@ -10,6 +10,10 @@ Name[es]=hola mundo 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 @@ -25,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 @@ -35,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= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.9.0/tests/helloworldnowindow/metadata.desktop new/kdeclarative-5.10.0/tests/helloworldnowindow/metadata.desktop --- old/kdeclarative-5.9.0/tests/helloworldnowindow/metadata.desktop 2015-04-04 14:02:53.000000000 +0200 +++ new/kdeclarative-5.10.0/tests/helloworldnowindow/metadata.desktop 2015-05-03 17:08:09.000000000 +0200 @@ -10,6 +10,10 @@ Name[es]=hola mundo 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 @@ -25,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 @@ -35,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=
