diff --git a/src/qdeclarativefolderlistmodel.cpp b/src/qdeclarativefolderlistmodel.cpp index b1c6fb418aadb7f4ef303711928a3aba0456b5f9..62c66a6a29320c317eeb277c4ff4cfc634994e05 100644 --- a/src/qdeclarativefolderlistmodel.cpp +++ b/src/qdeclarativefolderlistmodel.cpp @@ -43,7 +43,7 @@ #include "qdeclarativefolderlistmodel.h" #include <QtWidgets/QDirModel> #include <QDebug> -#include <qdeclarativecontext.h> +#include <qqmlcontext.h> #ifndef QT_NO_DIRMODEL diff --git a/src/qdeclarativefolderlistmodel.h b/src/qdeclarativefolderlistmodel.h index 53ea3f1b19458e093ae8a4acbbae5c12eae72331..599329113c0c3fdf64496b2831f1135c7cc3e644 100644 --- a/src/qdeclarativefolderlistmodel.h +++ b/src/qdeclarativefolderlistmodel.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEFOLDERLISTMODEL_H #define QDECLARATIVEFOLDERLISTMODEL_H -#include <qdeclarative.h> +#include <qqml.h> #include <QStringList> #include <QUrl> #include <QAbstractListModel> @@ -58,10 +58,10 @@ class QModelIndex; class QDeclarativeFolderListModelPrivate; -class QDeclarativeFolderListModel : public QAbstractListModel, public QDeclarativeParserStatus +class QDeclarativeFolderListModel : public QAbstractListModel, public QQmlParserStatus { Q_OBJECT - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) Q_PROPERTY(QUrl folder READ folder WRITE setFolder NOTIFY folderChanged) Q_PROPERTY(QUrl parentFolder READ parentFolder NOTIFY folderChanged) diff --git a/src/qdesktopitem.h b/src/qdesktopitem.h index 6ab222935e4f393ea796a07b6f2344ac6c0d6abb..44a6feeac6ea7957d92409c358241a45af96747b 100644 --- a/src/qdesktopitem.h +++ b/src/qdesktopitem.h @@ -28,7 +28,7 @@ #define QDESKTOPITEM_H #include <QtWidgets/QDesktopWidget> -#include <QtDeclarative> +#include <QtQml> class QDesktopItem : public QObject { diff --git a/src/qrangemodel.h b/src/qrangemodel.h index 66f759814ef646bfc8e3f38fe5e7c62f0e4d50e6..d22c492ca806b07b9fffc36ae91139feedc5508e 100644 --- a/src/qrangemodel.h +++ b/src/qrangemodel.h @@ -30,7 +30,7 @@ #include <QtCore/qobject.h> //#include <QtGui/qgraphicsitem.h> #include <QtWidgets/qabstractslider.h> -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> class QRangeModelPrivate; diff --git a/src/qstyleplugin.cpp b/src/qstyleplugin.cpp index e1f7489427ee64c1b376423b49ca220847bf56c4..c2d8b6e3bc0f2f74bad629d29b3f755aabbab923 100644 --- a/src/qstyleplugin.cpp +++ b/src/qstyleplugin.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include <qdeclarative.h> +#include <qqml.h> #include "qstyleplugin.h" #include "qstyleitem.h" #include "qrangemodel.h" @@ -46,22 +46,19 @@ #include "qcursorarea.h" #include "qtooltiparea.h" #include "qtsplitterbase.h" -#include <qdeclarativeextensionplugin.h> +#include <qqmlextensionplugin.h> -#include <qdeclarativeengine.h> -#include <qdeclarative.h> -//#include <qdeclarativeitem.h> -#include <qdeclarativeimageprovider.h> -//x#include <qdeclarativeview.h> +#include <qqmlengine.h> +#include <qquickimageprovider.h> #include <QtWidgets/QApplication> #include <QImage> // Load icons from desktop theme -class DesktopIconProvider : public QDeclarativeImageProvider +class DesktopIconProvider : public QQuickImageProvider { public: DesktopIconProvider() - : QDeclarativeImageProvider(QDeclarativeImageProvider::Pixmap) + : QQuickImageProvider(QQuickImageProvider::Pixmap) { } @@ -92,7 +89,7 @@ void StylePlugin::registerTypes(const char *uri) qmlRegisterUncreatableType<QDesktopItem>(uri, 0,2,"Desktop", QLatin1String("Do not create objects of type Desktop")); } -void StylePlugin::initializeEngine(QDeclarativeEngine *engine, const char *uri) +void StylePlugin::initializeEngine(QQmlEngine *engine, const char *uri) { Q_UNUSED(uri); engine->addImageProvider("desktoptheme", new DesktopIconProvider); diff --git a/src/qstyleplugin.h b/src/qstyleplugin.h index 28a08b1b86ffe853276194335a654cd535e8b83d..99decb21dfbdf4ea25aa731eaa52e68187d6ddca 100644 --- a/src/qstyleplugin.h +++ b/src/qstyleplugin.h @@ -40,18 +40,18 @@ #ifndef STYLEPLUGIN_H #define STYLEPLUGIN_H -#include <QDeclarativeExtensionPlugin> +#include <QQmlExtensionPlugin> #include <QtCore/QTimer> #include <QtWidgets/QFileSystemModel> #include "qdeclarativefolderlistmodel.h" -class StylePlugin : public QDeclarativeExtensionPlugin +class StylePlugin : public QQmlExtensionPlugin { Q_OBJECT public: void registerTypes(const char *uri); - void initializeEngine(QDeclarativeEngine *engine, const char *uri); + void initializeEngine(QQmlEngine *engine, const char *uri); }; #endif // STYLEPLUGIN_H diff --git a/src/qtsplitterbase.h b/src/qtsplitterbase.h index c5507e2f1006d576d2284af2ad202e7b6871bbe3..603d881830ce6738f28fde0b0babb1d5a6a7de0b 100644 --- a/src/qtsplitterbase.h +++ b/src/qtsplitterbase.h @@ -1,7 +1,7 @@ #ifndef QTSPLITTERBASE_H #define QTSPLITTERBASE_H -#include <QtDeclarative> +#include <QtQml> #include <QtQuick> diff --git a/src/src.pro b/src/src.pro index c3448d8b02080112edccd2a1058412a4a619995f..90f4ff0ad7a2c8e2ee0658ef3f754b04a318d047 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += qt plugin -QT += declarative +QT += qml QT += quick QT += script QT += widgets