Modify QtQuick1 to build in Qt5

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

20 files changed, 25 insertions, 23 deletions

diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro
index ad918c33..84044f4f 100644
--- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro
+++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += qt plugin
-QT += declarative
+QT += quick1
 
 DESTDIR = ImageProviderCore
 TARGET  = qmlimageproviderplugin
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
index 4f321977..88636c37 100644
--- a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
+++ b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
@@ -28,7 +28,7 @@ symbian:TARGET.CAPABILITY += NetworkServices
 
 # Add dependency to Symbian components
 # CONFIG += qt-components
-QT += network
+QT += network widgets
 
 # The .cpp file which was generated for your project. Feel free to hack it.
 SOURCES += main.cpp
diff --git a/examples/declarative/cppextensions/plugins/plugin.cpp b/examples/declarative/cppextensions/plugins/plugin.cpp
index c26e889c..b77c9fb6 100644
--- a/examples/declarative/cppextensions/plugins/plugin.cpp
+++ b/examples/declarative/cppextensions/plugins/plugin.cpp
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 
-#include <QtDeclarative/QDeclarativeExtensionPlugin>
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQuick1/QDeclarativeExtensionPlugin>
+#include <QtQuick1/qdeclarative.h>
 #include <qdebug.h>
 #include <qdatetime.h>
 #include <qbasictimer.h>
diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/declarative/cppextensions/plugins/plugins.pro
index e5c05e09..a29d3efe 100644
--- a/examples/declarative/cppextensions/plugins/plugins.pro
+++ b/examples/declarative/cppextensions/plugins/plugins.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += qt plugin
-QT += declarative
+QT += widgets quick1
 
 DESTDIR = com/nokia/TimeExample
 TARGET  = qmlqtimeexampleplugin
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro
index 77c6b2a2..9054f191 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro
+++ b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = 
 DEPENDPATH += .
 INCLUDEPATH += .
-QT += declarative
+QT += widgets quick1
 
 SOURCES += main.cpp
 RESOURCES += layoutitem.qrc
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro
index e42b7ed5..e616fae1 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro
@@ -28,7 +28,7 @@ symbian:TARGET.CAPABILITY += NetworkServices
 
 # Add dependency to Symbian components
 # CONFIG += qt-components
-QT += network
+QT += network widgets
 
 # The .cpp file which was generated for your project. Feel free to hack it.
 SOURCES += \
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro
index 52955e8a..bec3691b 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro
@@ -29,6 +29,8 @@ symbian:TARGET.CAPABILITY += NetworkServices
 # Add dependency to Symbian components
 # CONFIG += qt-components
 
+QT += widgets
+
 # The .cpp file which was generated for your project. Feel free to hack it.
 SOURCES += \
     linearlayout.cpp \
diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.cpp b/examples/declarative/cppextensions/qwidgets/qwidgets.cpp
index 7781f126..d87cc7d8 100644
--- a/examples/declarative/cppextensions/qwidgets/qwidgets.cpp
+++ b/examples/declarative/cppextensions/qwidgets/qwidgets.cpp
@@ -38,10 +38,10 @@
 **
 ****************************************************************************/
 
-#include <QtDeclarative/QDeclarativeExtensionPlugin>
-#include <QtDeclarative/qdeclarative.h>
-#include <QtGui/QGraphicsProxyWidget>
-#include <QtGui/QPushButton>
+#include <QtQuick1/QDeclarativeExtensionPlugin>
+#include <QtQuick1/qdeclarative.h>
+#include <QtWidgets/QGraphicsProxyWidget>
+#include <QtWidgets/QPushButton>
 #include <QDebug>
 
 class MyPushButton : public QGraphicsProxyWidget
diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.pro b/examples/declarative/cppextensions/qwidgets/qwidgets.pro
index d2721808..750c864b 100644
--- a/examples/declarative/cppextensions/qwidgets/qwidgets.pro
+++ b/examples/declarative/cppextensions/qwidgets/qwidgets.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += qt plugin
-QT += declarative
+QT += widgets quick1
 
 DESTDIR = QWidgets
 TARGET = qmlqwidgetsplugin
diff --git a/examples/declarative/cppextensions/referenceexamples/adding/adding.pro b/examples/declarative/cppextensions/referenceexamples/adding/adding.pro
index b2acf0e4..8e22ea06 100644
--- a/examples/declarative/cppextensions/referenceexamples/adding/adding.pro
+++ b/examples/declarative/cppextensions/referenceexamples/adding/adding.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = adding
 DEPENDPATH += .
 INCLUDEPATH += .
-QT += declarative
+QT += quick1
 
 # Input
 SOURCES += main.cpp \
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/attached.pro b/examples/declarative/cppextensions/referenceexamples/attached/attached.pro
index 24488412..57084da8 100644
--- a/examples/declarative/cppextensions/referenceexamples/attached/attached.pro
+++ b/examples/declarative/cppextensions/referenceexamples/attached/attached.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = attached
 DEPENDPATH += .
 INCLUDEPATH += .
-QT += declarative
+QT += quick1
 
 # Input
 SOURCES += main.cpp \
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/binding.pro b/examples/declarative/cppextensions/referenceexamples/binding/binding.pro
index 063de622..b8ecc2cb 100644
--- a/examples/declarative/cppextensions/referenceexamples/binding/binding.pro
+++ b/examples/declarative/cppextensions/referenceexamples/binding/binding.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = binding
 DEPENDPATH += .
 INCLUDEPATH += .
-QT += declarative
+QT += quick1
 
 # Input
 SOURCES += main.cpp \
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro
index 4b63bac7..d8acfa7e 100644
--- a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro
+++ b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = coercion
 DEPENDPATH += .
 INCLUDEPATH += .
-QT += declarative
+QT += quick1
 
 # Input
 SOURCES += main.cpp \
diff --git a/examples/declarative/cppextensions/referenceexamples/default/default.pro b/examples/declarative/cppextensions/referenceexamples/default/default.pro
index aa72c11a..63ea07c3 100644
--- a/examples/declarative/cppextensions/referenceexamples/default/default.pro
+++ b/examples/declarative/cppextensions/referenceexamples/default/default.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = default
 DEPENDPATH += .
 INCLUDEPATH += .
-QT += declarative
+QT += quick1
 
 # Input
 SOURCES += main.cpp \
diff --git a/examples/declarative/cppextensions/referenceexamples/extended/extended.pro b/examples/declarative/cppextensions/referenceexamples/extended/extended.pro
index fb263fd4..0513e96b 100644
--- a/examples/declarative/cppextensions/referenceexamples/extended/extended.pro
+++ b/examples/declarative/cppextensions/referenceexamples/extended/extended.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = extended
 DEPENDPATH += .
 INCLUDEPATH += .
-QT += declarative
+QT += widgets quick1
 
 # Input
 SOURCES += main.cpp \
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro b/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro
index 93406b64..92040e8c 100644
--- a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro
+++ b/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = grouped
 DEPENDPATH += .
 INCLUDEPATH += .
-QT += declarative
+QT += quick1
 
 # Input
 SOURCES += main.cpp \
diff --git a/examples/declarative/cppextensions/referenceexamples/methods/methods.pro b/examples/declarative/cppextensions/referenceexamples/methods/methods.pro
index ae062428..35868f8d 100644
--- a/examples/declarative/cppextensions/referenceexamples/methods/methods.pro
+++ b/examples/declarative/cppextensions/referenceexamples/methods/methods.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = methods
 DEPENDPATH += .
 INCLUDEPATH += .
-QT += declarative
+QT += quick1
 
 # Input
 SOURCES += main.cpp \
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/properties.pro b/examples/declarative/cppextensions/referenceexamples/properties/properties.pro
index 7b7616d1..d5160bab 100644
--- a/examples/declarative/cppextensions/referenceexamples/properties/properties.pro
+++ b/examples/declarative/cppextensions/referenceexamples/properties/properties.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = properties
 DEPENDPATH += .
 INCLUDEPATH += .
-QT += declarative
+QT += quick1
 
 # Input
 SOURCES += main.cpp \
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/signal.pro b/examples/declarative/cppextensions/referenceexamples/signal/signal.pro
index 339cfbc9..a32ca93a 100644
--- a/examples/declarative/cppextensions/referenceexamples/signal/signal.pro
+++ b/examples/declarative/cppextensions/referenceexamples/signal/signal.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = signal
 DEPENDPATH += .
 INCLUDEPATH += .
-QT += declarative
+QT += quick1
 
 # Input
 SOURCES += main.cpp \
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro b/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro
index e95914b7..770529d5 100644
--- a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro
+++ b/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = valuesource
 DEPENDPATH += .
 INCLUDEPATH += .
-QT += declarative
+QT += quick1
 
 # Input
 SOURCES += main.cpp \