diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp b/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp
index 2da6e3c8fe767c680067f1e4ff6e1bf18fd7fd39..7caeaf9471f41b3d78f3c103fb7ee34b0ddcd61c 100644
--- a/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp
+++ b/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
+#include <QGuiApplication>
 #include <QNetworkAccessManager>
 #include <QNetworkProxy>
 
@@ -80,7 +80,7 @@ int main(int argc, char ** argv)
 {
     QUrl source("qrc:view.qml");
 
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
 
     for (int i = 1; i < argc; ++i) {
         QString arg(argv[i]);
diff --git a/examples/declarative/cppextensions/plugins/plugin.cpp b/examples/declarative/cppextensions/plugins/plugin.cpp
index 056e09383bb04c84ea344cc3d370de5dfa7445e5..299b0ff3e7bc252b8ea9c769db01a4d4d7de48ad 100644
--- a/examples/declarative/cppextensions/plugins/plugin.cpp
+++ b/examples/declarative/cppextensions/plugins/plugin.cpp
@@ -43,7 +43,7 @@
 #include <qdebug.h>
 #include <qdatetime.h>
 #include <qbasictimer.h>
-#include <qapplication.h>
+#include <qcoreapplication.h>
 
 // Implements a "TimeModel" class with hour and minute properties
 // that change on-the-minute yet efficiently sleep the rest
@@ -109,7 +109,7 @@ public:
     {
         if (++instances == 1) {
             if (!timer)
-                timer = new MinuteTimer(qApp);
+                timer = new MinuteTimer(QCoreApplication::instance());
             connect(timer, SIGNAL(timeChanged()), this, SIGNAL(timeChanged()));
             timer->start();
         }
diff --git a/examples/declarative/cppextensions/referenceexamples/extended/extended.pro b/examples/declarative/cppextensions/referenceexamples/extended/extended.pro
index d4c9dc9c6ec11c2533de098170aebcdcb3190233..78585f690604771b2465d403154df0800e2d3ba5 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 += declarative widgets
 
 # Input
 SOURCES += main.cpp \
diff --git a/examples/declarative/modelviews/objectlistmodel/main.cpp b/examples/declarative/modelviews/objectlistmodel/main.cpp
index 345b5eec87a6882b9c603a3108423f5b684fddea..ba37e17d18bb4a34b4d4b0adb145ecb2c6a97e49 100644
--- a/examples/declarative/modelviews/objectlistmodel/main.cpp
+++ b/examples/declarative/modelviews/objectlistmodel/main.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
+#include <QGuiApplication>
 
 #include <qdeclarativeengine.h>
 #include <qdeclarativecontext.h>
@@ -56,7 +56,7 @@
 //![0]
 int main(int argc, char ** argv)
 {
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
 
     QList<QObject*> dataList;
     dataList.append(new DataObject("Item 1", "red"));
diff --git a/examples/declarative/modelviews/stringlistmodel/main.cpp b/examples/declarative/modelviews/stringlistmodel/main.cpp
index 1f474c4cc64ba054e7a7e6eaf99a819bef89875c..5d01c6fae865e7ed8b2f90ff08192dcc3e920b6a 100644
--- a/examples/declarative/modelviews/stringlistmodel/main.cpp
+++ b/examples/declarative/modelviews/stringlistmodel/main.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
+#include <QGuiApplication>
 #include <QStringList>
 
 #include <qdeclarativeengine.h>
@@ -55,7 +55,7 @@
 
 int main(int argc, char ** argv)
 {
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
 
 //![0]
     QStringList dataList;
diff --git a/examples/declarative/painteditem/smile/main.cpp b/examples/declarative/painteditem/smile/main.cpp
index bc3a9d6b0379c3258114bea90eeb179c18c3ce0d..423ff295c934763b0a6997d3364f882d0b88efc5 100644
--- a/examples/declarative/painteditem/smile/main.cpp
+++ b/examples/declarative/painteditem/smile/main.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
+#include <QGuiApplication>
 #include <QPainter>
 #include <QtDeclarative/qdeclarative.h>
 #include <QtDeclarative/qsgview.h>
@@ -68,7 +68,7 @@ public:
 
 int main(int argc, char ** argv)
 {
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
 
     qmlRegisterType<MyPaintItem>("MyModule", 1, 0, "MyPaintItem");
 
diff --git a/examples/declarative/tutorials/extending/chapter1-basics/main.cpp b/examples/declarative/tutorials/extending/chapter1-basics/main.cpp
index 4c11768e18d1106ddf6c86763e65041a82a9e08b..ca6a97e0c7d4118abba58515ab0b972ec79ee309 100644
--- a/examples/declarative/tutorials/extending/chapter1-basics/main.cpp
+++ b/examples/declarative/tutorials/extending/chapter1-basics/main.cpp
@@ -40,11 +40,11 @@
 //![0]
 #include "piechart.h"
 #include <QSGView>
-#include <QApplication>
+#include <QGuiApplication>
 
 int main(int argc, char *argv[])
 {
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
 
     qmlRegisterType<PieChart>("Charts", 1, 0, "PieChart");
 
diff --git a/examples/declarative/tutorials/extending/chapter2-methods/main.cpp b/examples/declarative/tutorials/extending/chapter2-methods/main.cpp
index 4c11768e18d1106ddf6c86763e65041a82a9e08b..ca6a97e0c7d4118abba58515ab0b972ec79ee309 100644
--- a/examples/declarative/tutorials/extending/chapter2-methods/main.cpp
+++ b/examples/declarative/tutorials/extending/chapter2-methods/main.cpp
@@ -40,11 +40,11 @@
 //![0]
 #include "piechart.h"
 #include <QSGView>
-#include <QApplication>
+#include <QGuiApplication>
 
 int main(int argc, char *argv[])
 {
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
 
     qmlRegisterType<PieChart>("Charts", 1, 0, "PieChart");
 
diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp b/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp
index 4c11768e18d1106ddf6c86763e65041a82a9e08b..ca6a97e0c7d4118abba58515ab0b972ec79ee309 100644
--- a/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp
+++ b/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp
@@ -40,11 +40,11 @@
 //![0]
 #include "piechart.h"
 #include <QSGView>
-#include <QApplication>
+#include <QGuiApplication>
 
 int main(int argc, char *argv[])
 {
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
 
     qmlRegisterType<PieChart>("Charts", 1, 0, "PieChart");
 
diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp
index 1113cc55cbc739e5ce197ef48c60fb53422766a7..d2812767cfcc77378aa213f1fb55c408bcbfed7f 100644
--- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp
+++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp
@@ -41,13 +41,13 @@
 #include "pieslice.h"
 
 #include <QSGView>
-#include <QApplication>
+#include <QGuiApplication>
 
 //![0]
 int main(int argc, char *argv[])
 {
 //![0]
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
 
     qmlRegisterType<PieChart>("Charts", 1, 0, "PieChart");
 
diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp b/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp
index 1c43a090ca67920c46d1098f2acda7a2615f86bc..64c18f74bc1f09f03c36b97a1b051157a4f2bd48 100644
--- a/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp
+++ b/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp
@@ -41,11 +41,11 @@
 #include "pieslice.h"
 
 #include <QSGView>
-#include <QApplication>
+#include <QGuiApplication>
 
 int main(int argc, char *argv[])
 {
-    QApplication app(argc, argv);
+    QGuiApplication app(argc, argv);
 
     qmlRegisterType<PieChart>("Charts", 1, 0, "PieChart");
     qmlRegisterType<PieSlice>("Charts", 1, 0, "PieSlice");
diff --git a/tests/auto/declarative/qsgborderimage/qsgborderimage.pro b/tests/auto/declarative/qsgborderimage/qsgborderimage.pro
index 7b0c1d5560d96f57075735dc9b071c3b2ae55e54..5a68e67e446ee4b601a077d82ca23cf6fb9adb6b 100644
--- a/tests/auto/declarative/qsgborderimage/qsgborderimage.pro
+++ b/tests/auto/declarative/qsgborderimage/qsgborderimage.pro
@@ -1,5 +1,4 @@
 load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui network
 macx:CONFIG -= app_bundle
 
 HEADERS += ../shared/testhttpserver.h
@@ -15,6 +14,6 @@ symbian: {
 
 CONFIG += parallel_test
 
-QT += core-private gui-private declarative-private
+QT += core-private gui-private declarative-private network widgets
 
 qpa:CONFIG+=insignificant_test  # QTBUG-21004 fails, unstably
diff --git a/tests/auto/declarative/qsgpathview/qsgpathview.pro b/tests/auto/declarative/qsgpathview/qsgpathview.pro
index 312443f5913bdd5308d97d23f47ff174a2742781..a9b3838a0c97a61b91ce6bf1818eb6b85c4e6f4d 100644
--- a/tests/auto/declarative/qsgpathview/qsgpathview.pro
+++ b/tests/auto/declarative/qsgpathview/qsgpathview.pro
@@ -1,5 +1,4 @@
 load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_qsgpathview.cpp
@@ -15,4 +14,4 @@ symbian: {
 CONFIG += parallel_test 
 #temporary
 CONFIG += insignificant_test
-QT += core-private gui-private v8-private declarative-private
+QT += core-private gui-private v8-private declarative-private widgets
diff --git a/tests/auto/declarative/qsgvisualdatamodel/qsgvisualdatamodel.pro b/tests/auto/declarative/qsgvisualdatamodel/qsgvisualdatamodel.pro
index 7770f8ff0f4ef2e4d85cc9e1eda631dd1be27018..31047068d724a4c0d6268049c2cf88f6256bdf09 100644
--- a/tests/auto/declarative/qsgvisualdatamodel/qsgvisualdatamodel.pro
+++ b/tests/auto/declarative/qsgvisualdatamodel/qsgvisualdatamodel.pro
@@ -1,5 +1,4 @@
 load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_qsgvisualdatamodel.cpp
@@ -14,4 +13,4 @@ symbian: {
 
 CONFIG += parallel_test
 
-QT += core-private gui-private v8-private declarative-private
+QT += core-private gui-private v8-private declarative-private widgets