Hello community, here is the log from the commit of package kdeclarative for openSUSE:Factory checked in at 2018-04-19 15:15:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeclarative (Old) and /work/SRC/openSUSE:Factory/.kdeclarative.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdeclarative" Thu Apr 19 15:15:23 2018 rev:54 rq:596860 version:5.45.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdeclarative/kdeclarative.changes 2018-03-20 21:45:11.278459297 +0100 +++ /work/SRC/openSUSE:Factory/.kdeclarative.new/kdeclarative.changes 2018-04-19 15:15:51.672047138 +0200 @@ -1,0 +2,13 @@ +Sat Apr 14 13:19:03 CEST 2018 - [email protected] + +- Update to 5.45.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.45.0.php +- Changes since 5.44.0: + * Remove useless QT_VERSION_CHECK + * Remove not necessary QtCore and co + * Setup QQmlEngine only once in QmlObject + * Minor: Fix -Wmismatched-tags warning + +------------------------------------------------------------------- Old: ---- kdeclarative-5.44.0.tar.xz New: ---- kdeclarative-5.45.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeclarative.spec ++++++ --- /var/tmp/diff_new_pack.WPnkCa/_old 2018-04-19 15:15:52.444016481 +0200 +++ /var/tmp/diff_new_pack.WPnkCa/_new 2018-04-19 15:15:52.452016163 +0200 @@ -18,19 +18,16 @@ %bcond_without lang %define lname libKF5Declarative5 -%define _tar_path 5.44 +%define _tar_path 5.45 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kdeclarative -Version: 5.44.0 +Version: 5.45.0 Release: 0 %define kf5_version %{version} Summary: Integration of QML and KDE workspaces -# Note for legal: GPL-2.0+ files relicensed upstream with permission from the authors -# See commits g7482bef08, g62b8e46 and gaf91457 in the upstream KDE repository. -# They will be part of the next release (5.39) License: LGPL-2.1-or-later Group: System/GUI/KDE Url: http://www.kde.org ++++++ kdeclarative-5.44.0.tar.xz -> kdeclarative-5.45.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.44.0/CMakeLists.txt new/kdeclarative-5.45.0/CMakeLists.txt --- old/kdeclarative-5.44.0/CMakeLists.txt 2018-03-03 11:02:11.000000000 +0100 +++ new/kdeclarative-5.45.0/CMakeLists.txt 2018-04-07 21:34:05.000000000 +0200 @@ -1,18 +1,18 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.44.0") # handled by release scripts -set(KF5_DEP_VERSION "5.44.0") # handled by release scripts +set(KF5_VERSION "5.45.0") # handled by release scripts +set(KF5_DEP_VERSION "5.45.0") # handled by release scripts project(KDeclarative VERSION ${KF5_VERSION}) # Dependencies include(FeatureSummary) -find_package(ECM 5.44.0 NO_MODULE) +find_package(ECM 5.45.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -set(REQUIRED_QT_VERSION 5.7.0) +set(REQUIRED_QT_VERSION 5.8.0) 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.44.0/autotests/modeltest.cpp new/kdeclarative-5.45.0/autotests/modeltest.cpp --- old/kdeclarative-5.44.0/autotests/modeltest.cpp 2018-03-03 11:02:11.000000000 +0100 +++ new/kdeclarative-5.45.0/autotests/modeltest.cpp 2018-04-07 21:34:05.000000000 +0200 @@ -40,11 +40,11 @@ ****************************************************************************/ -#include <QtGui/QtGui> +#include <QtGui> #include "modeltest.h" -#include <QtTest/QtTest> +#include <QtTest> //#undef Q_ASSERT //#define Q_ASSERT QVERIFY diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.44.0/autotests/modeltest.h new/kdeclarative-5.45.0/autotests/modeltest.h --- old/kdeclarative-5.44.0/autotests/modeltest.h 2018-03-03 11:02:11.000000000 +0100 +++ new/kdeclarative-5.45.0/autotests/modeltest.h 2018-04-07 21:34:05.000000000 +0200 @@ -43,9 +43,9 @@ #ifndef MODELTEST_H #define MODELTEST_H -#include <QtCore/QObject> -#include <QtCore/QAbstractItemModel> -#include <QtCore/QStack> +#include <QObject> +#include <QAbstractItemModel> +#include <QStack> class ModelTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.44.0/autotests/quickviewsharedengine.cpp new/kdeclarative-5.45.0/autotests/quickviewsharedengine.cpp --- old/kdeclarative-5.44.0/autotests/quickviewsharedengine.cpp 2018-03-03 11:02:11.000000000 +0100 +++ new/kdeclarative-5.45.0/autotests/quickviewsharedengine.cpp 2018-04-07 21:34:05.000000000 +0200 @@ -31,15 +31,15 @@ ** ****************************************************************************/ #include <qtest.h> -#include <QtTest/QSignalSpy> -#include <QtQml/qqmlcomponent.h> -#include <QtQml/qqmlcontext.h> -#include <QtQuick/qquickview.h> -#include <QtQuick/qquickitem.h> +#include <QSignalSpy> +#include <qqmlcomponent.h> +#include <qqmlcontext.h> +#include <qquickview.h> +#include <qquickitem.h> #include "util.h" -#include <QtGui/QWindow> -#include <QtCore/QDebug> -#include <QtQml/qqmlengine.h> +#include <QWindow> +#include <QDebug> +#include <qqmlengine.h> #include <quickviewsharedengine.h> class QuickViewSharedEngineTest : public QQmlDataTest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.44.0/autotests/util.cpp new/kdeclarative-5.45.0/autotests/util.cpp --- old/kdeclarative-5.44.0/autotests/util.cpp 2018-03-03 11:02:11.000000000 +0100 +++ new/kdeclarative-5.45.0/autotests/util.cpp 2018-04-07 21:34:05.000000000 +0200 @@ -33,13 +33,13 @@ #include "util.h" -#include <QtQml/QQmlComponent> -#include <QtQml/QQmlError> -#include <QtQml/QQmlContext> -#include <QtQml/QQmlEngine> -#include <QtCore/QTextStream> -#include <QtCore/QDebug> -#include <QtCore/QMutexLocker> +#include <QQmlComponent> +#include <QQmlError> +#include <QQmlContext> +#include <QQmlEngine> +#include <QTextStream> +#include <QDebug> +#include <QMutexLocker> QQmlDataTest *QQmlDataTest::m_instance = nullptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.44.0/autotests/util.h new/kdeclarative-5.45.0/autotests/util.h --- old/kdeclarative-5.44.0/autotests/util.h 2018-03-03 11:02:11.000000000 +0100 +++ new/kdeclarative-5.45.0/autotests/util.h 2018-04-07 21:34:05.000000000 +0200 @@ -34,11 +34,11 @@ #ifndef QQMLTESTUTILS_H #define QQMLTESTUTILS_H -#include <QtCore/QDir> -#include <QtCore/QUrl> -#include <QtCore/QCoreApplication> -#include <QtCore/QStringList> -#include <QtTest/QTest> +#include <QDir> +#include <QUrl> +#include <QCoreApplication> +#include <QStringList> +#include <QTest> QT_FORWARD_DECLARE_CLASS(QQmlComponent) QT_FORWARD_DECLARE_CLASS(QQmlEngine) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.44.0/po/zh_CN/kdeclarative5.po new/kdeclarative-5.45.0/po/zh_CN/kdeclarative5.po --- old/kdeclarative-5.44.0/po/zh_CN/kdeclarative5.po 2018-03-03 11:02:11.000000000 +0100 +++ new/kdeclarative-5.45.0/po/zh_CN/kdeclarative5.po 2018-04-07 21:34:05.000000000 +0200 @@ -15,7 +15,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-30 03:07+0100\n" -"PO-Revision-Date: 2018-02-28 02:23-0500\n" +"PO-Revision-Date: 2018-04-05 09:22-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.44.0/src/kdeclarative/kdeclarative.cpp new/kdeclarative-5.45.0/src/kdeclarative/kdeclarative.cpp --- old/kdeclarative-5.44.0/src/kdeclarative/kdeclarative.cpp 2018-03-03 11:02:11.000000000 +0100 +++ new/kdeclarative-5.45.0/src/kdeclarative/kdeclarative.cpp 2018-04-07 21:34:05.000000000 +0200 @@ -25,11 +25,11 @@ #include <QCoreApplication> #include <QDebug> -#include <QtQml/QQmlComponent> -#include <QtQml/QQmlContext> -#include <QtQml/QQmlEngine> -#include <QtQml/QQmlExpression> -#include <QtQml/QQmlDebuggingEnabler> +#include <QQmlComponent> +#include <QQmlContext> +#include <QQmlEngine> +#include <QQmlExpression> +#include <QQmlDebuggingEnabler> #include <kconfiggroup.h> #include <ksharedconfig.h> @@ -74,12 +74,12 @@ void KDeclarative::setupBindings() { - //get rid of stock network access manager factory - QQmlNetworkAccessManagerFactory *factory = d->declarativeEngine.data()->networkAccessManagerFactory(); - d->declarativeEngine.data()->setNetworkAccessManagerFactory(nullptr); - delete factory; - d->declarativeEngine.data()->setNetworkAccessManagerFactory(new KIOAccessManagerFactory()); + setupContext(); + setupEngine(d->declarativeEngine.data()); +} +void KDeclarative::setupContext() +{ /*Create a context object for the root qml context. in this way we can register global functions, in this case the i18n() family*/ if (!d->contextObj) { @@ -96,12 +96,21 @@ if (!d->translationDomain.isNull()) { d->contextObj->setTranslationDomain(d->translationDomain); } +} + +void KDeclarative::setupEngine(QQmlEngine *engine) +{ + //get rid of stock network access manager factory + QQmlNetworkAccessManagerFactory *factory = engine->networkAccessManagerFactory(); + engine->setNetworkAccessManagerFactory(nullptr); + delete factory; + engine->setNetworkAccessManagerFactory(new KIOAccessManagerFactory()); /* Tell the engine to search for platform-specific imports first (so it will "win" in import name resolution). addImportPath adds the path at the beginning, so to honour user's paths we need to traverse the list in reverse order */ - const QStringList pluginPathList = d->declarativeEngine.data()->importPathList(); + const QStringList pluginPathList = engine->importPathList(); const QString target = componentsTarget(); if (target != defaultComponentsTarget()) { @@ -111,12 +120,12 @@ while (it.hasPrevious()) { QString path = it.previous(); path = path.left(path.lastIndexOf(QLatin1Char('/'))); - d->declarativeEngine.data()->addImportPath(path + QStringLiteral("/platformqml/") + target); + engine->addImportPath(path + QStringLiteral("/platformqml/") + target); } } // setup ImageProvider for KDE icons - d->declarativeEngine.data()->addImageProvider(QStringLiteral("icon"), new KIconProvider); + engine->addImageProvider(QStringLiteral("icon"), new KIconProvider); } void KDeclarative::setTranslationDomain(const QString &translationDomain) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.44.0/src/kdeclarative/kdeclarative.h new/kdeclarative-5.45.0/src/kdeclarative/kdeclarative.h --- old/kdeclarative-5.44.0/src/kdeclarative/kdeclarative.h 2018-03-03 11:02:11.000000000 +0100 +++ new/kdeclarative-5.45.0/src/kdeclarative/kdeclarative.h 2018-04-07 21:34:05.000000000 +0200 @@ -20,7 +20,7 @@ #ifndef KDECLARATIVE_H #define KDECLARATIVE_H -#include <QtQml/QQmlEngine> +#include <QQmlEngine> #include <kdeclarative/kdeclarative_export.h> @@ -48,18 +48,28 @@ * @deprecated since 5.0. The method is a no-op now, any call can be simply removed. */ KDECLARATIVE_DEPRECATED void initialize(); -#endif /** * Call this after setDeclarativeEngine to set the i18n global functions, the runtime platform, etc + * + * @deprecated since 5.45 use setupContext() and setupEngine() + */ + KDECLARATIVE_DEPRECATED void setupBindings(); +#endif + + /** + * Call this after setDeclarativeEngine to set the i18n global functions. + * + * @since 5.45 + * @sa setupEngine */ - void setupBindings(); + void setupContext(); void setDeclarativeEngine(QQmlEngine *engine); QQmlEngine *declarativeEngine() const; /** - * Call this method before calling setupBindings to install a translation domain for all + * Call this method before calling setupContext to install a translation domain for all * i18n global functions. If a translation domain is set all i18n calls delegate to the * matching i18nd calls with the provided translation domain. * @@ -117,6 +127,17 @@ */ static QString defaultComponentsTarget(); + /** + * Setup the QML engine used by this KDeclarative object. + * + * This needs to be done only once per QQmlEngine instance. + * + * @since 5.45 + * @param engine The engine to setup + * @sa setupContext + */ + static void setupEngine(QQmlEngine *engine); + private: KDeclarativePrivate *const d; friend class QmlObject; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.44.0/src/kdeclarative/private/kdeclarative_p.h new/kdeclarative-5.45.0/src/kdeclarative/private/kdeclarative_p.h --- old/kdeclarative-5.44.0/src/kdeclarative/private/kdeclarative_p.h 2018-03-03 11:02:11.000000000 +0100 +++ new/kdeclarative-5.45.0/src/kdeclarative/private/kdeclarative_p.h 2018-04-07 21:34:05.000000000 +0200 @@ -23,7 +23,7 @@ #include "kdeclarative.h" #include "qmlobject.h" -#include <QtCore/QPointer> +#include <QPointer> #include <KLocalizedContext> namespace KDeclarative { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.44.0/src/kdeclarative/private/kiconprovider_p.h new/kdeclarative-5.45.0/src/kdeclarative/private/kiconprovider_p.h --- old/kdeclarative-5.44.0/src/kdeclarative/private/kiconprovider_p.h 2018-03-03 11:02:11.000000000 +0100 +++ new/kdeclarative-5.45.0/src/kdeclarative/private/kiconprovider_p.h 2018-04-07 21:34:05.000000000 +0200 @@ -18,7 +18,7 @@ #ifndef ICON_PROVIDER_H #define ICON_PROVIDER_H -#include <QtQuick/QQuickImageProvider> +#include <QQuickImageProvider> namespace KDeclarative { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.44.0/src/kdeclarative/qmlobject.cpp new/kdeclarative-5.45.0/src/kdeclarative/qmlobject.cpp --- old/kdeclarative-5.44.0/src/kdeclarative/qmlobject.cpp 2018-03-03 11:02:11.000000000 +0100 +++ new/kdeclarative-5.45.0/src/kdeclarative/qmlobject.cpp 2018-04-07 21:34:05.000000000 +0200 @@ -141,36 +141,35 @@ } QmlObject::QmlObject(QObject *parent) - : QObject(parent), - d(new QmlObjectPrivate(this)) + // cannot do : QmlObject(new QQmlEngine(this), d->engine->rootContext(), parent) + : QObject(parent) + , d(new QmlObjectPrivate(this)) + { d->engine = new QQmlEngine(this); d->rootContext = d->engine->rootContext(); d->kdeclarative.setDeclarativeEngine(d->engine); d->kdeclarative.d->qmlObj = this; - //binds things like kconfig and icons - d->kdeclarative.setupBindings(); + + d->kdeclarative.setupContext(); + KDeclarative::setupEngine(d->engine); } QmlObject::QmlObject(QQmlEngine *engine, QObject *parent) - : QObject(parent), - d(new QmlObjectPrivate(this)) + : QmlObject(engine, engine->rootContext(), parent) { - if (engine) { - d->engine = engine; - } else { - d->engine = new QQmlEngine(this); - } - d->rootContext = d->engine->rootContext(); - d->kdeclarative.setDeclarativeEngine(d->engine); - d->kdeclarative.d->qmlObj = this; - //binds things like kconfig and icons - d->kdeclarative.setupBindings(); + } QmlObject::QmlObject(QQmlEngine *engine, QQmlContext *rootContext, QObject *parent) - : QObject(parent), - d(new QmlObjectPrivate(this)) + : QmlObject(engine, rootContext, nullptr /*call setupEngine*/, parent) +{ + +} + +QmlObject::QmlObject(QQmlEngine *engine, QQmlContext *rootContext, QmlObject *obj, QObject *parent) + : QObject(parent) + , d(new QmlObjectPrivate(this)) { if (engine) { d->engine = engine; @@ -185,8 +184,12 @@ } d->kdeclarative.setDeclarativeEngine(d->engine); d->kdeclarative.d->qmlObj = this; - //binds things like kconfig and icons - d->kdeclarative.setupBindings(); + + d->kdeclarative.setupContext(); + + if (!obj) { + KDeclarative::setupEngine(d->engine); + } } QmlObject::~QmlObject() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.44.0/src/kdeclarative/qmlobject.h new/kdeclarative-5.45.0/src/kdeclarative/qmlobject.h --- old/kdeclarative-5.44.0/src/kdeclarative/qmlobject.h 2018-03-03 11:02:11.000000000 +0100 +++ new/kdeclarative-5.45.0/src/kdeclarative/qmlobject.h 2018-04-07 21:34:05.000000000 +0200 @@ -237,6 +237,20 @@ void statusChanged(QQmlComponent::Status); +protected: + /** + * Constructs a new QmlObject + * + * @param engine a QQmlEngine we want to use + * @param rootContext the root context we want to use for objects creation + * @param obj setupEngine is called when this is set to nullptr. This way the creator can + * influence if the engine should be initialized or not in case it is shared between + * multiple objects (such as QmlObjectSharedEngine) + * @param parent the parent of this object + * @since 5.45 + */ + explicit QmlObject(QQmlEngine *engine, QQmlContext *rootContext, QmlObject *obj, QObject *parent = nullptr); + private: friend class QmlObjectPrivate; QmlObjectPrivate *const d; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.44.0/src/kdeclarative/qmlobjectsharedengine.cpp new/kdeclarative-5.45.0/src/kdeclarative/qmlobjectsharedengine.cpp --- old/kdeclarative-5.44.0/src/kdeclarative/qmlobjectsharedengine.cpp 2018-03-03 11:02:11.000000000 +0100 +++ new/kdeclarative-5.45.0/src/kdeclarative/qmlobjectsharedengine.cpp 2018-04-07 21:34:05.000000000 +0200 @@ -53,6 +53,7 @@ { if (!s_engine) { s_engine = std::make_shared<QQmlEngine>(); + KDeclarative::setupEngine(s_engine.get()); } return s_engine.get(); } @@ -66,7 +67,7 @@ std::shared_ptr<QQmlEngine> QmlObjectSharedEnginePrivate::s_engine = std::shared_ptr<QQmlEngine>(); QmlObjectSharedEngine::QmlObjectSharedEngine(QObject *parent) - : QmlObject(QmlObjectSharedEnginePrivate::engine(), new QQmlContext(QmlObjectSharedEnginePrivate::engine()), parent), + : QmlObject(QmlObjectSharedEnginePrivate::engine(), new QQmlContext(QmlObjectSharedEnginePrivate::engine()), this /*don't call setupEngine*/, parent), d(new QmlObjectSharedEnginePrivate()) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.44.0/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp new/kdeclarative-5.45.0/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp --- old/kdeclarative-5.44.0/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp 2018-03-03 11:02:11.000000000 +0100 +++ new/kdeclarative-5.45.0/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp 2018-04-07 21:34:05.000000000 +0200 @@ -26,7 +26,7 @@ #include <QAction> #include <QKeyEvent> #include <QTimer> -#include <QtCore/QHash> +#include <QHash> #include <QToolButton> #include <QApplication> #include <QDebug> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.44.0/src/quickaddons/imagetexturescache.cpp new/kdeclarative-5.45.0/src/quickaddons/imagetexturescache.cpp --- old/kdeclarative-5.44.0/src/quickaddons/imagetexturescache.cpp 2018-03-03 11:02:11.000000000 +0100 +++ new/kdeclarative-5.45.0/src/quickaddons/imagetexturescache.cpp 2018-04-07 21:34:05.000000000 +0200 @@ -23,8 +23,9 @@ typedef QHash<qint64, QHash<QWindow*, QWeakPointer<QSGTexture> > > TexturesCache; -struct ImageTexturesCachePrivate +class ImageTexturesCachePrivate { +public: TexturesCache cache; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.44.0/src/quickaddons/qtquicksettings.cpp new/kdeclarative-5.45.0/src/quickaddons/qtquicksettings.cpp --- old/kdeclarative-5.44.0/src/quickaddons/qtquicksettings.cpp 2018-03-03 11:02:11.000000000 +0100 +++ new/kdeclarative-5.45.0/src/quickaddons/qtquicksettings.cpp 2018-04-07 21:34:05.000000000 +0200 @@ -31,11 +31,7 @@ } if (!s.sceneGraphBackend().isNull()) { -#if QT_VERSION >= QT_VERSION_CHECK(5,8,0) QQuickWindow::setSceneGraphBackend(s.sceneGraphBackend()); -#else - qputenv("QMLSCENE_DEVICE", s.sceneGraphBackend().toLatin1()); -#endif } if (s.forceGlCoreProfile()) { QSurfaceFormat format; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.44.0/tests/kdeclarativetest.cpp new/kdeclarative-5.45.0/tests/kdeclarativetest.cpp --- old/kdeclarative-5.44.0/tests/kdeclarativetest.cpp 2018-03-03 11:02:11.000000000 +0100 +++ new/kdeclarative-5.45.0/tests/kdeclarativetest.cpp 2018-04-07 21:34:05.000000000 +0200 @@ -18,12 +18,12 @@ */ #include <QGuiApplication> -#include <QtQuick/QQuickView> -#include <QtQml/QQmlContext> +#include <QQuickView> +#include <QQmlContext> #include <kdeclarative/kdeclarative.h> -#include <QtTest/qtestcase.h> +#include <qtestcase.h> int main(int argc, char *argv[]) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.44.0/tests/qimageitemtest.cpp new/kdeclarative-5.45.0/tests/qimageitemtest.cpp --- old/kdeclarative-5.44.0/tests/qimageitemtest.cpp 2018-03-03 11:02:11.000000000 +0100 +++ new/kdeclarative-5.45.0/tests/qimageitemtest.cpp 2018-04-07 21:34:05.000000000 +0200 @@ -18,10 +18,10 @@ */ #include <QGuiApplication> -#include <QtQuick/QQuickView> -#include <QtQml/QQmlContext> +#include <QQuickView> +#include <QQmlContext> -#include <QtTest/qtestcase.h> +#include <qtestcase.h> int main(int argc, char *argv[]) {
