diff --git a/tests/manual/debugger/qquick2/app.pro b/tests/manual/debugger/qquick2/app.pro index 2994749979c7e280a43c3db1d3be67e948a1c2c6..835748dd66beddcfcfbdfdf71e5a259f75940df0 100644 --- a/tests/manual/debugger/qquick2/app.pro +++ b/tests/manual/debugger/qquick2/app.pro @@ -1,4 +1,4 @@ -QT += declarative quick +QT += qml quick macx:CONFIG -= app_bundle diff --git a/tests/manual/debugger/qquick2/main.cpp b/tests/manual/debugger/qquick2/main.cpp index b66c3d9af9b50fc8bf16fa92cf2d4ab32b28387e..6cd5a3a9ac8545dd8d67b843dbdd549b086aa973 100644 --- a/tests/manual/debugger/qquick2/main.cpp +++ b/tests/manual/debugger/qquick2/main.cpp @@ -1,7 +1,7 @@ #include <QGuiApplication> #include <QQuickView> -#include <QDeclarativeContext> -#include <QDeclarativeEngine> +#include <QQmlContext> +#include <QQmlEngine> #include <QDebug> class Backend : public QObject { diff --git a/tests/manual/debugger/qquick2/myplugin/myplugin.cpp b/tests/manual/debugger/qquick2/myplugin/myplugin.cpp index 879e5beace72dc2d4fea265a95ca27fca7a57512..8b4de2168552ce85dd99191a1129338eb3f32e88 100644 --- a/tests/manual/debugger/qquick2/myplugin/myplugin.cpp +++ b/tests/manual/debugger/qquick2/myplugin/myplugin.cpp @@ -1,6 +1,8 @@ #include "myplugin.h" #include "mytype.h" +#include <qqml.h> + void MyPlugin::registerTypes(const char *uri) { // @uri mymodule @@ -8,4 +10,3 @@ void MyPlugin::registerTypes(const char *uri) qmlRegisterType<MyType>(uri, 1, 0, "MyType"); } -Q_EXPORT_PLUGIN(MyPlugin) diff --git a/tests/manual/debugger/qquick2/myplugin/myplugin.h b/tests/manual/debugger/qquick2/myplugin/myplugin.h index bf2d86041fe2346635a62ce54d6904061437a68e..053f8bdf153ebf295d3aa22da53bbeac28499f50 100644 --- a/tests/manual/debugger/qquick2/myplugin/myplugin.h +++ b/tests/manual/debugger/qquick2/myplugin/myplugin.h @@ -1,13 +1,12 @@ #ifndef MYPLUGIN_H #define MYPLUGIN_H -#include <qdeclarative.h> -#include <QDeclarativeExtensionPlugin> +#include <QQmlExtensionPlugin> -class MyPlugin : public QDeclarativeExtensionPlugin +class MyPlugin : public QQmlExtensionPlugin { Q_OBJECT - + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") public: void registerTypes(const char *uri); }; diff --git a/tests/manual/debugger/qquick2/myplugin/myplugin.pro b/tests/manual/debugger/qquick2/myplugin/myplugin.pro index 09116f6977b0ed9357a1897f24bdd77f3fa3560b..5b8c5d1510477753926a9326c561445b31c60845 100644 --- a/tests/manual/debugger/qquick2/myplugin/myplugin.pro +++ b/tests/manual/debugger/qquick2/myplugin/myplugin.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = myplugin -QT += declarative +QT += qml CONFIG += qt plugin TARGET = $$qtLibraryTarget($$TARGET) diff --git a/tests/manual/debugger/qquick2/myplugin/mytype.cpp b/tests/manual/debugger/qquick2/myplugin/mytype.cpp index d8e52755713160fb82398f09a2a2572b3a2e7097..f3232af87034d68f7cce099e97bc8ecf278ae841 100644 --- a/tests/manual/debugger/qquick2/myplugin/mytype.cpp +++ b/tests/manual/debugger/qquick2/myplugin/mytype.cpp @@ -1,8 +1,8 @@ +#include "mytype.h" + #include <QTimer> #include <QTime> -#include <qdeclarative.h> - -#include "mytype.h" +#include <qqml.h> MyType::MyType(QObject *parent) : QObject(parent) diff --git a/tests/manual/debugger/qquick2/myplugin/qmldir b/tests/manual/debugger/qquick2/myplugin/qmldir index a244fa6ad8e108a6a997a7ffdbb988ee15318f21..c3cf4d4281585c72337cd809db2a8c85ce0c99ce 100644 --- a/tests/manual/debugger/qquick2/myplugin/qmldir +++ b/tests/manual/debugger/qquick2/myplugin/qmldir @@ -1 +1,2 @@ +module myplugin plugin myplugin