Modify QtQuick1 to build in Qt5

Change-Id: I1c5ccaef420e8f119e761f50b969127f430df7ba
Reviewed-by: Martin Jones <martin.jones@nokia.com>

12 files changed, 15 insertions, 15 deletions

diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro
index 0f639797..fd80acd1 100644
--- a/src/imports/folderlistmodel/folderlistmodel.pro
+++ b/src/imports/folderlistmodel/folderlistmodel.pro
@@ -2,7 +2,7 @@ TARGET  = qmlfolderlistmodelplugin
 TARGETPATH = Qt/labs/folderlistmodel
 include(../qimportbase.pri)
 
-QT += declarative script
+QT += widgets quick1 script
 
 SOURCES += qdeclarativefolderlistmodel.cpp plugin.cpp
 HEADERS += qdeclarativefolderlistmodel.h
diff --git a/src/imports/folderlistmodel/plugin.cpp b/src/imports/folderlistmodel/plugin.cpp
index 61054a1e..f2b9620b 100644
--- a/src/imports/folderlistmodel/plugin.cpp
+++ b/src/imports/folderlistmodel/plugin.cpp
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 
-#include <QtDeclarative/qdeclarativeextensionplugin.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQuick1/qdeclarativeextensionplugin.h>
+#include <QtQuick1/qdeclarative.h>
 
 #include "qdeclarativefolderlistmodel.h"
 
diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro
index 2768cc9c..03dd7293 100644
--- a/src/imports/gestures/gestures.pro
+++ b/src/imports/gestures/gestures.pro
@@ -2,7 +2,7 @@ TARGET  = qmlgesturesplugin
 TARGETPATH = Qt/labs/gestures
 include(../qimportbase.pri)
 
-QT += declarative
+QT += quick1 quick1-private widgets widgets-private gui gui-private core-private script-private
 
 SOURCES += qdeclarativegesturearea.cpp plugin.cpp
 HEADERS += qdeclarativegesturearea_p.h
diff --git a/src/imports/gestures/plugin.cpp b/src/imports/gestures/plugin.cpp
index 15c9d22e..2cd67327 100644
--- a/src/imports/gestures/plugin.cpp
+++ b/src/imports/gestures/plugin.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <QtDeclarative/qdeclarativeextensionplugin.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQuick1/qdeclarativeextensionplugin.h>
+#include <QtQuick1/qdeclarative.h>
 
 #include "qdeclarativegesturearea_p.h"
 
diff --git a/src/imports/gestures/qdeclarativegesturearea_p.h b/src/imports/gestures/qdeclarativegesturearea_p.h
index 8171b376..3048e413 100644
--- a/src/imports/gestures/qdeclarativegesturearea_p.h
+++ b/src/imports/gestures/qdeclarativegesturearea_p.h
@@ -48,7 +48,7 @@
 
 #include <QtCore/qobject.h>
 #include <QtCore/qstring.h>
-#include <QtGui/qgesture.h>
+#include <QtWidgets/qgesture.h>
 
 #ifndef QT_NO_GESTURES
 
diff --git a/src/imports/particles/particles.cpp b/src/imports/particles/particles.cpp
index 533ec08d..15d1de1d 100644
--- a/src/imports/particles/particles.cpp
+++ b/src/imports/particles/particles.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <QtDeclarative/qdeclarativeextensionplugin.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQuick1/qdeclarativeextensionplugin.h>
+#include <QtQuick1/qdeclarative.h>
 
 #include "qdeclarativeparticles_p.h"
 
diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro
index 894d164c..019b63ae 100644
--- a/src/imports/particles/particles.pro
+++ b/src/imports/particles/particles.pro
@@ -2,7 +2,7 @@ TARGET  = qmlparticlesplugin
 TARGETPATH = Qt/labs/particles
 include(../qimportbase.pri)
 
-QT += declarative
+QT += quick1 quick1-private core-private gui-private widgets-private
 
 SOURCES += \
     qdeclarativeparticles.cpp \
diff --git a/src/imports/particles/qdeclarativeparticles.cpp b/src/imports/particles/qdeclarativeparticles.cpp
index b2b304a7..53b447ee 100644
--- a/src/imports/particles/qdeclarativeparticles.cpp
+++ b/src/imports/particles/qdeclarativeparticles.cpp
@@ -48,7 +48,7 @@
 #include <QtCore/QAbstractAnimation>
 
 #include <QPainter>
-#include <QtGui/qdrawutil.h>
+#include <QtWidgets/qdrawutil.h>
 #include <QVarLengthArray>
 
 #include <stdlib.h>
diff --git a/src/imports/particles/qdeclarativeparticles_p.h b/src/imports/particles/qdeclarativeparticles_p.h
index 0a2b6d8d..79213068 100644
--- a/src/imports/particles/qdeclarativeparticles_p.h
+++ b/src/imports/particles/qdeclarativeparticles_p.h
@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVEPARTICLES_H
 #define QDECLARATIVEPARTICLES_H
 
-#include <QtDeclarative/qdeclarativeitem.h>
+#include <QtQuick1/qdeclarativeitem.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/imports/shaders/qmlshadersplugin_plugin.cpp b/src/imports/shaders/qmlshadersplugin_plugin.cpp
index 613e1834..00a537c1 100644
--- a/src/imports/shaders/qmlshadersplugin_plugin.cpp
+++ b/src/imports/shaders/qmlshadersplugin_plugin.cpp
@@ -43,7 +43,7 @@
 #include "shadereffectitem.h"
 #include "shadereffectsource.h"
 
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQuick1/qdeclarative.h>
 
 void qmlshaderspluginPlugin::registerTypes(const char *uri)
 {
diff --git a/src/imports/shaders/qmlshadersplugin_plugin.h b/src/imports/shaders/qmlshadersplugin_plugin.h
index d1f7746c..98765aa2 100644
--- a/src/imports/shaders/qmlshadersplugin_plugin.h
+++ b/src/imports/shaders/qmlshadersplugin_plugin.h
@@ -42,7 +42,7 @@
 #ifndef QMLSHADERSPLUGIN_PLUGIN_H
 #define QMLSHADERSPLUGIN_PLUGIN_H
 
-#include <QtDeclarative/QDeclarativeExtensionPlugin>
+#include <QtQuick1/QDeclarativeExtensionPlugin>
 
 class qmlshaderspluginPlugin : public QDeclarativeExtensionPlugin
 {
diff --git a/src/imports/shaders/shaders.pro b/src/imports/shaders/shaders.pro
index 51a9a918..2d089528 100644
--- a/src/imports/shaders/shaders.pro
+++ b/src/imports/shaders/shaders.pro
@@ -2,7 +2,7 @@ TARGET = qmlshadersplugin
 TARGETPATH = Qt/labs/shaders
 include(../qimportbase.pri)
 
-QT += declarative opengl
+QT += quick1 opengl
 
 SOURCES += \
     qmlshadersplugin_plugin.cpp \