Merge branch 'refactor'

Conflicts:
	src/xmlpatterns/xmlpatterns.pro

Change-Id: I8d435220281ec372f23c98ab3c15c9a208bacad8

12 files changed, 21 insertions, 22 deletions

diff --git a/examples/xmlpatterns/filetree/filetree.pro b/examples/xmlpatterns/filetree/filetree.pro
index fc1c11b..4b3430a 100644
--- a/examples/xmlpatterns/filetree/filetree.pro
+++ b/examples/xmlpatterns/filetree/filetree.pro
@@ -1,7 +1,7 @@
 SOURCES += main.cpp filetree.cpp mainwindow.cpp ../shared/xmlsyntaxhighlighter.cpp
 HEADERS += filetree.h  mainwindow.h ../shared/xmlsyntaxhighlighter.h
 FORMS += forms/mainwindow.ui
-QT += xmlpatterns
+QT += widgets xmlpatterns
 RESOURCES += queries.qrc
 INCLUDEPATH += ../shared/
 
diff --git a/examples/xmlpatterns/filetree/main.cpp b/examples/xmlpatterns/filetree/main.cpp
index 939072a..339b62a 100644
--- a/examples/xmlpatterns/filetree/main.cpp
+++ b/examples/xmlpatterns/filetree/main.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 
 #include "mainwindow.h"
 
diff --git a/examples/xmlpatterns/filetree/mainwindow.cpp b/examples/xmlpatterns/filetree/mainwindow.cpp
index 43502ce..96cb793 100644
--- a/examples/xmlpatterns/filetree/mainwindow.cpp
+++ b/examples/xmlpatterns/filetree/mainwindow.cpp
@@ -38,7 +38,8 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QFileDialog>
+#include <QMessageBox>
 #include <QLibraryInfo>
 #include <QtXmlPatterns>
 
diff --git a/examples/xmlpatterns/recipes/querymainwindow.cpp b/examples/xmlpatterns/recipes/querymainwindow.cpp
index 95a8669..2393306 100644
--- a/examples/xmlpatterns/recipes/querymainwindow.cpp
+++ b/examples/xmlpatterns/recipes/querymainwindow.cpp
@@ -38,7 +38,8 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QMessageBox>
+#include <QFileDialog>
 #include <QtXmlPatterns>
 
 #include "querymainwindow.h"
diff --git a/examples/xmlpatterns/recipes/recipes.pro b/examples/xmlpatterns/recipes/recipes.pro
index 9e78db4..2e1f8ec 100644
--- a/examples/xmlpatterns/recipes/recipes.pro
+++ b/examples/xmlpatterns/recipes/recipes.pro
@@ -1,4 +1,4 @@
-QT          += xmlpatterns
+QT          += widgets xmlpatterns
 FORMS       += forms/querywidget.ui \
                forms/querywidget_mobiles.ui
 HEADERS     = querymainwindow.h ../shared/xmlsyntaxhighlighter.h
diff --git a/examples/xmlpatterns/schema/schema.pro b/examples/xmlpatterns/schema/schema.pro
index 4fda651..61b147c 100644
--- a/examples/xmlpatterns/schema/schema.pro
+++ b/examples/xmlpatterns/schema/schema.pro
@@ -1,4 +1,4 @@
-QT          += xmlpatterns
+QT          += widgets xmlpatterns
 FORMS       += schema.ui schema_mobiles.ui
 HEADERS     = mainwindow.h ../shared/xmlsyntaxhighlighter.h
 RESOURCES   = schema.qrc
diff --git a/examples/xmlpatterns/trafficinfo/main.cpp b/examples/xmlpatterns/trafficinfo/main.cpp
index 95acca5..78227ce 100644
--- a/examples/xmlpatterns/trafficinfo/main.cpp
+++ b/examples/xmlpatterns/trafficinfo/main.cpp
@@ -40,7 +40,7 @@
 
 #include "mainwindow.h"
 
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 
 int main(int argc, char **argv)
 {
diff --git a/examples/xmlpatterns/trafficinfo/mainwindow.cpp b/examples/xmlpatterns/trafficinfo/mainwindow.cpp
index 72a561c..4b14156 100644
--- a/examples/xmlpatterns/trafficinfo/mainwindow.cpp
+++ b/examples/xmlpatterns/trafficinfo/mainwindow.cpp
@@ -43,8 +43,8 @@
 
 #include <QtCore/QSettings>
 #include <QtCore/QTimer>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QApplication>
 #include <QtGui/QBitmap>
 #include <QtGui/QLinearGradient>
 #include <QtGui/QMouseEvent>
diff --git a/examples/xmlpatterns/trafficinfo/mainwindow.h b/examples/xmlpatterns/trafficinfo/mainwindow.h
index 800131e..d451d33 100644
--- a/examples/xmlpatterns/trafficinfo/mainwindow.h
+++ b/examples/xmlpatterns/trafficinfo/mainwindow.h
@@ -44,7 +44,7 @@
 #include "stationquery.h"
 #include "timequery.h"
 
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
 
 class MainWindow : public QWidget
 {
diff --git a/examples/xmlpatterns/trafficinfo/stationdialog.h b/examples/xmlpatterns/trafficinfo/stationdialog.h
index 81a73e8..fa738f8 100644
--- a/examples/xmlpatterns/trafficinfo/stationdialog.h
+++ b/examples/xmlpatterns/trafficinfo/stationdialog.h
@@ -41,7 +41,7 @@
 #ifndef STATIONDIALOG_H
 #define STATIONDIALOG_H
 
-#include <QtGui/QDialog>
+#include <QtWidgets/QDialog>
 
 #include "stationquery.h"
 #include "ui_stationdialog.h"
diff --git a/examples/xmlpatterns/trafficinfo/trafficinfo.pro b/examples/xmlpatterns/trafficinfo/trafficinfo.pro
index d0aa7d2..8a12910 100644
--- a/examples/xmlpatterns/trafficinfo/trafficinfo.pro
+++ b/examples/xmlpatterns/trafficinfo/trafficinfo.pro
@@ -1,4 +1,4 @@
-QT          += xmlpatterns
+QT          += widgets xmlpatterns
 HEADERS     = mainwindow.h stationdialog.h stationquery.h timequery.h
 SOURCES     = main.cpp mainwindow.cpp stationdialog.cpp stationquery.cpp timequery.cpp
 FORMS       = stationdialog.ui
diff --git a/src/xmlpatterns/xmlpatterns.pro b/src/xmlpatterns/xmlpatterns.pro
index 1422a0e..c1960c7 100644
--- a/src/xmlpatterns/xmlpatterns.pro
+++ b/src/xmlpatterns/xmlpatterns.pro
@@ -1,23 +1,20 @@
 load(qt_module)
 
-TARGET = QtXmlPatterns
-QPRO_PWD = $$PWD
-QT = core-private \
-    network
+TARGET     = QtXmlPatterns
+QPRO_PWD   = $$PWD
 
 CONFIG += module
-MODULE_PRI = ../../modules/qt_xmlpatterns.pri
+MODULE_PRI += ../../modules/qt_xmlpatterns.pri
 
-DEFINES += QT_BUILD_XMLPATTERNS_LIB \
-    QT_NO_USING_NAMESPACE
+QT = core-private network
+
+DEFINES += QT_BUILD_XMLPATTERNS_LIB QT_NO_USING_NAMESPACE
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000
-unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore \
-    QtNetwork
+unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtNetwork
 load(qt_module_config)
 
 HEADERS += qtxmlpatternsversion.h
 
-PRECOMPILED_HEADER = $$QT_SOURCE_TREE/src/corelib/global/qt_pch.h
 include($$PWD/common.pri)
 include($$PWD/acceltree/acceltree.pri)
 include($$PWD/api/api.pri)