Fix export symbols for QtDeclarative and QtQuick1.

Fix build on Windows and compiler warnings.

Requires 090ee21eac7257644422e35395194e5fd7fb8efa in qtbase.

Change-Id: Ief8da504ccd3e2c2e78644cc9943d685c4302019
Reviewed-on: http://codereview.qt.nokia.com/3988
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

5 files changed, 9 insertions, 9 deletions

diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.cpp b/examples/declarative/cppextensions/qwidgets/qwidgets.cpp
index 843ac0f1f2..de22a415aa 100644
--- a/examples/declarative/cppextensions/qwidgets/qwidgets.cpp
+++ b/examples/declarative/cppextensions/qwidgets/qwidgets.cpp
@@ -40,9 +40,9 @@
 
 #include <QtDeclarative/QDeclarativeExtensionPlugin>
 #include <QtDeclarative/qdeclarative.h>
-#include <QtGui/QGraphicsProxyWidget>
-#include <QtGui/QPushButton>
-#include <QDebug>
+#include <QtWidgets/QGraphicsProxyWidget>
+#include <QtWidgets/QPushButton>
+#include <QtCore/QDebug>
 
 class MyPushButton : public QGraphicsProxyWidget
 {
diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.pro b/examples/declarative/cppextensions/qwidgets/qwidgets.pro
index d7e6f9318a..678abaa020 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 declarative
 
 DESTDIR = QWidgets
 TARGET = qmlqwidgetsplugin
diff --git a/examples/declarative/minehunt/main.cpp b/examples/declarative/minehunt/main.cpp
index 93b9a5280b..752e470d3f 100644
--- a/examples/declarative/minehunt/main.cpp
+++ b/examples/declarative/minehunt/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include <QtQuick1/QDeclarativeView>
 #include <QtDeclarative/QDeclarativeContext>
 #include <QtDeclarative/QDeclarativeEngine>
diff --git a/examples/declarative/minehunt/minehunt.pro b/examples/declarative/minehunt/minehunt.pro
index fe464fb498..12c167236c 100644
--- a/examples/declarative/minehunt/minehunt.pro
+++ b/examples/declarative/minehunt/minehunt.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET  = minehunt
-QT += declarative qtquick1
+QT += declarative qtquick1 widgets
 
 # Input
 HEADERS += minehunt.h
diff --git a/examples/declarative/script/shell/main.cpp b/examples/declarative/script/shell/main.cpp
index ad29fb87e1..5ee8a5e1ca 100644
--- a/examples/declarative/script/shell/main.cpp
+++ b/examples/declarative/script/shell/main.cpp
@@ -44,7 +44,7 @@
 #include <QtCore/qstringlist.h>
 #include <QtCore/qscopedpointer.h>
 
-#include <QtGui/qapplication.h>
+#include <QtGui/QGuiApplication>
 
 #include <QtDeclarative/qjsengine.h>
 
@@ -95,7 +95,7 @@ static void interactive(QJSEngine *eng)
 
 int main(int argc, char *argv[])
 {
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
     QScopedPointer<QJSEngine> eng(new QJSEngine());
     {
         QJSValue globalObject = eng->globalObject();
@@ -150,4 +150,4 @@ int main(int argc, char *argv[])
     return EXIT_SUCCESS;
 }
 
-#include <main.moc>
\ No newline at end of file
+#include <main.moc>