Stop using deperacated header files.

Change-Id: I0c600fe57dc9e6a61d348cd6f4fc7dcf21fa2b70
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

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
 

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)

src/qdesktopitem.h

@@ -28,7 +28,7 @@
 #define QDESKTOPITEM_H
 
 #include <QtWidgets/QDesktopWidget>
-#include <QtDeclarative>
+#include <QtQml>
 
 class QDesktopItem : public QObject
 {

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;
 

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);

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

src/qtsplitterbase.h

 #ifndef QTSPLITTERBASE_H
 #define QTSPLITTERBASE_H
 
-#include <QtDeclarative>
+#include <QtQml>
 #include <QtQuick>
 
 

src/src.pro

 TEMPLATE = lib
 CONFIG += qt plugin
-QT += declarative
+QT += qml
 QT += quick
 QT += script
 QT += widgets