diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmleasing/main.cpp | 4 | ||||
| -rw-r--r-- | tools/qmleasing/qmleasing.pro | 2 | ||||
| -rw-r--r-- | tools/qmlplugindump/main.cpp | 16 | ||||
| -rw-r--r-- | tools/qmlplugindump/qmlplugindump.pro | 2 | ||||
| -rw-r--r-- | tools/qmlscene/main.cpp | 4 | ||||
| -rw-r--r-- | tools/qmlscene/qmlscene.pro | 2 |
6 files changed, 17 insertions, 13 deletions
diff --git a/tools/qmleasing/main.cpp b/tools/qmleasing/main.cpp index a9f1da41d4..224e23f544 100644 --- a/tools/qmleasing/main.cpp +++ b/tools/qmleasing/main.cpp @@ -40,10 +40,10 @@ ****************************************************************************/ #include <QPainter> -#include <QQuickView> +#include <QtQuick/QQuickView> #include <QApplication> #include <QEasingCurve> -#include <QQuickPaintedItem> +#include <QtQuick/QQuickPaintedItem> class EasingPlot : public QQuickPaintedItem { diff --git a/tools/qmleasing/qmleasing.pro b/tools/qmleasing/qmleasing.pro index 4a64fe91e0..eb2ee86070 100644 --- a/tools/qmleasing/qmleasing.pro +++ b/tools/qmleasing/qmleasing.pro @@ -3,7 +3,7 @@ TARGET = DEPENDPATH += . INCLUDEPATH += . -QT += declarative widgets +QT += declarative quick widgets CONFIG -= app_bundle # Input diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index 5e35abcc8b..c9f6cbe6c1 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -39,15 +39,19 @@ ** ****************************************************************************/ -#include <QtDeclarative/QtDeclarative> +#include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/private/qdeclarativemetatype_p.h> #include <QtDeclarative/private/qdeclarativeopenmetaobject_p.h> -#include <QtDeclarative/private/qquickevents_p_p.h> -#include <QtDeclarative/private/qquickpincharea_p.h> +#include <QtQuick/private/qquickevents_p_p.h> +#include <QtQuick/private/qquickpincharea_p.h> #include <QtWidgets/QApplication> +#include <QtCore/QDir> +#include <QtCore/QFileInfo> #include <QtCore/QSet> +#include <QtCore/QStringList> +#include <QtCore/QTimer> #include <QtCore/QMetaObject> #include <QtCore/QMetaProperty> #include <QtCore/QDebug> @@ -674,11 +678,11 @@ int main(int argc, char *argv[]) engine.addImportPath(pluginImportPath); } - // load the QtQuick 1 plugin + // load the QtQuick 1 & 2 plugins { - QByteArray code("import QtQuick 1.0\nQtObject {}"); + QByteArray code("import QtQuick 1.0 as Q1\nimport QtQuick 2.0 as Q2\nQ2.QtObject {}"); QDeclarativeComponent c(&engine); - c.setData(code, QUrl::fromLocalFile(pluginImportPath + "/loadqtquick1.qml")); + c.setData(code, QUrl::fromLocalFile(pluginImportPath + "/loadqtquick.qml")); c.create(); if (!c.errors().isEmpty()) { foreach (const QDeclarativeError &error, c.errors()) diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro index 7db7722c62..a327bb68d9 100644 --- a/tools/qmlplugindump/qmlplugindump.pro +++ b/tools/qmlplugindump/qmlplugindump.pro @@ -2,7 +2,7 @@ TEMPLATE = app CONFIG += qt uic console DESTDIR = $$QT.declarative.bins -QT += declarative declarative-private qtquick1 core-private widgets +QT += declarative declarative-private quick-private qtquick1 core-private widgets TARGET = qmlplugindump diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index 336fc899cd..696686afef 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -58,8 +58,8 @@ #include <QtDeclarative/qdeclarativecontext.h> // ### This should be private API -#include <qquickitem.h> -#include <qquickview.h> +#include <QtQuick/qquickitem.h> +#include <QtQuick/qquickview.h> #define QT_NO_SCENEGRAPHITEM diff --git a/tools/qmlscene/qmlscene.pro b/tools/qmlscene/qmlscene.pro index d0c4ec7a20..4147c68005 100644 --- a/tools/qmlscene/qmlscene.pro +++ b/tools/qmlscene/qmlscene.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = qmlscene DESTDIR= $$QT.declarative.bins -QT += declarative declarative-private qtquick1 widgets +QT += declarative declarative-private quick qtquick1 widgets target.path = $$[QT_INSTALL_BINS] INSTALLS += target |