QtTools: Widget library split.

28 files changed, 48 insertions, 32 deletions

diff --git a/examples/designer/calculatorbuilder/calculatorbuilder.pro b/examples/designer/calculatorbuilder/calculatorbuilder.pro
index bf4fb1d13..1e0a35e42 100644
--- a/examples/designer/calculatorbuilder/calculatorbuilder.pro
+++ b/examples/designer/calculatorbuilder/calculatorbuilder.pro
@@ -5,6 +5,7 @@ HEADERS     = calculatorform.h
 RESOURCES   = calculatorbuilder.qrc
 SOURCES     = calculatorform.cpp \
               main.cpp
+QT += widgets
 #! [0]
 
 # install
diff --git a/examples/designer/calculatorbuilder/calculatorform.cpp b/examples/designer/calculatorbuilder/calculatorform.cpp
index e14efa497..cc559e54a 100644
--- a/examples/designer/calculatorbuilder/calculatorform.cpp
+++ b/examples/designer/calculatorbuilder/calculatorform.cpp
@@ -41,7 +41,9 @@
 //! [0]
 #include <QtUiTools>
 //! [0]
-#include <QtGui>
+#include <QSpinBox>
+#include <QLabel>
+#include <QVBoxLayout>
 
 #include "calculatorform.h"
 
diff --git a/examples/designer/calculatorform/calculatorform.pro b/examples/designer/calculatorform/calculatorform.pro
index 757d313c7..b2a7427c6 100644
--- a/examples/designer/calculatorform/calculatorform.pro
+++ b/examples/designer/calculatorform/calculatorform.pro
@@ -5,6 +5,7 @@ FORMS       = calculatorform.ui
 #! [1]
 SOURCES     = calculatorform.cpp \
               main.cpp
+QT += widgets
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/calculatorform
diff --git a/examples/designer/containerextension/containerextension.pro b/examples/designer/containerextension/containerextension.pro
index a7bc02f4c..fc7a1ff81 100644
--- a/examples/designer/containerextension/containerextension.pro
+++ b/examples/designer/containerextension/containerextension.pro
@@ -4,6 +4,7 @@ TEMPLATE = lib
 TARGET   = $$qtLibraryTarget($$TARGET)
 #! [1]
 CONFIG  += designer plugin
+QT      += widgets
 #! [1]
 DESTDIR = $$QT.designer.plugins/designer
 
diff --git a/examples/designer/containerextension/multipagewidget.cpp b/examples/designer/containerextension/multipagewidget.cpp
index 5b44f36d2..ff2418b0c 100644
--- a/examples/designer/containerextension/multipagewidget.cpp
+++ b/examples/designer/containerextension/multipagewidget.cpp
@@ -38,7 +38,9 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QComboBox>
+#include <QVBoxLayout>
+#include <QStackedWidget>
 
 #include "multipagewidget.h"
 
diff --git a/examples/designer/customwidgetplugin/customwidgetplugin.pro b/examples/designer/customwidgetplugin/customwidgetplugin.pro
index 3af8cc133..e70fe6575 100644
--- a/examples/designer/customwidgetplugin/customwidgetplugin.pro
+++ b/examples/designer/customwidgetplugin/customwidgetplugin.pro
@@ -1,5 +1,6 @@
 #! [0] #! [1]
 CONFIG      += designer plugin
+QT          += widgets
 #! [0]
 TARGET      = $$qtLibraryTarget($$TARGET)
 #! [2]
diff --git a/examples/designer/taskmenuextension/taskmenuextension.pro b/examples/designer/taskmenuextension/taskmenuextension.pro
index 4e5df7d1b..aaf3ab89c 100644
--- a/examples/designer/taskmenuextension/taskmenuextension.pro
+++ b/examples/designer/taskmenuextension/taskmenuextension.pro
@@ -4,6 +4,7 @@ TEMPLATE = lib
 TARGET   = $$qtLibraryTarget($$TARGET)
 #! [1]
 CONFIG  += designer plugin
+QT      += widgets
 #! [1]
 DESTDIR = $$QT.designer.plugins/designer
 
diff --git a/examples/designer/taskmenuextension/tictactoedialog.cpp b/examples/designer/taskmenuextension/tictactoedialog.cpp
index 5af3c6f30..5b6a8c4a3 100644
--- a/examples/designer/taskmenuextension/tictactoedialog.cpp
+++ b/examples/designer/taskmenuextension/tictactoedialog.cpp
@@ -38,7 +38,9 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QDialogButtonBox>
+#include <QPushButton>
+#include <QVBoxLayout>
 #include <QtDesigner>
 
 #include "tictactoe.h"
diff --git a/examples/designer/worldtimeclockbuilder/main.cpp b/examples/designer/worldtimeclockbuilder/main.cpp
index 680394190..e54a95a99 100644
--- a/examples/designer/worldtimeclockbuilder/main.cpp
+++ b/examples/designer/worldtimeclockbuilder/main.cpp
@@ -41,8 +41,8 @@
 //! [0]
 #include <QtUiTools>
 //! [0]
-#include <QtGui>
-
+#include <QApplication>
+#include <QWidget>
 //! [1]
 int main(int argc, char *argv[])
 {
diff --git a/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro b/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro
index 6d1164d55..005e35043 100644
--- a/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro
+++ b/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro
@@ -1,5 +1,6 @@
 #! [0]
 CONFIG      += uitools
+QT          += widgets
 SOURCES     = main.cpp
 RESOURCES   = worldtimeclockbuilder.qrc
 #! [0]
diff --git a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro
index e394a3dc8..8caad5e92 100644
--- a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro
+++ b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro
@@ -1,5 +1,6 @@
 #! [0]
 CONFIG      += designer plugin
+QT          += widgets
 #! [0]
 TARGET      = $$qtLibraryTarget($$TARGET)
 #! [1]
diff --git a/examples/help/contextsensitivehelp/contextsensitivehelp.pro b/examples/help/contextsensitivehelp/contextsensitivehelp.pro
index 8941dcbb1..9fa1a2a66 100644
--- a/examples/help/contextsensitivehelp/contextsensitivehelp.pro
+++ b/examples/help/contextsensitivehelp/contextsensitivehelp.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 
 CONFIG += help
-
+QT     += widgets
 SOURCES += main.cpp \
            wateringconfigdialog.cpp \
            helpbrowser.cpp
diff --git a/examples/help/contextsensitivehelp/helpbrowser.cpp b/examples/help/contextsensitivehelp/helpbrowser.cpp
index d37a72f3b..2182cf57b 100644
--- a/examples/help/contextsensitivehelp/helpbrowser.cpp
+++ b/examples/help/contextsensitivehelp/helpbrowser.cpp
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 #include <QtCore/QLibraryInfo>
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include <QtHelp/QHelpEngineCore>
 
 #include "helpbrowser.h"
diff --git a/examples/help/contextsensitivehelp/helpbrowser.h b/examples/help/contextsensitivehelp/helpbrowser.h
index 684ed6827..245772ac9 100644
--- a/examples/help/contextsensitivehelp/helpbrowser.h
+++ b/examples/help/contextsensitivehelp/helpbrowser.h
@@ -41,7 +41,7 @@
 #ifndef HELPBROWSER_H
 #define HELPBROWSER_H
 
-#include <QtGui/QTextBrowser>
+#include <QtWidgets/QTextBrowser>
 
 QT_BEGIN_NAMESPACE
 class QHelpEngineCore;
diff --git a/examples/help/contextsensitivehelp/main.cpp b/examples/help/contextsensitivehelp/main.cpp
index ca15d9fb6..d635db298 100644
--- a/examples/help/contextsensitivehelp/main.cpp
+++ b/examples/help/contextsensitivehelp/main.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 
 #include "wateringconfigdialog.h"
 
diff --git a/examples/help/contextsensitivehelp/wateringconfigdialog.h b/examples/help/contextsensitivehelp/wateringconfigdialog.h
index d1fd98643..835c46ec0 100644
--- a/examples/help/contextsensitivehelp/wateringconfigdialog.h
+++ b/examples/help/contextsensitivehelp/wateringconfigdialog.h
@@ -41,7 +41,7 @@
 #ifndef WATERINGCONFIGDIALOG_H
 #define WATERINGCONFIGDIALOG_H
 
-#include <QtGui/QDialog>
+#include <QtWidgets/QDialog>
 #include "ui_wateringconfigdialog.h"
 
 class WateringConfigDialog : public QDialog
diff --git a/examples/help/remotecontrol/main.cpp b/examples/help/remotecontrol/main.cpp
index ad561ce4f..583c2e494 100644
--- a/examples/help/remotecontrol/main.cpp
+++ b/examples/help/remotecontrol/main.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include "remotecontrol.h"
 
 int main(int argc, char *argv[])
diff --git a/examples/help/remotecontrol/remotecontrol.cpp b/examples/help/remotecontrol/remotecontrol.cpp
index 45d3fde82..d666489fb 100644
--- a/examples/help/remotecontrol/remotecontrol.cpp
+++ b/examples/help/remotecontrol/remotecontrol.cpp
@@ -43,7 +43,7 @@
 #include <QtCore/QTextStream>
 #include <QtCore/QLibraryInfo>
 
-#include <QtGui/QMessageBox>
+#include <QtWidgets/QMessageBox>
 
 #include "remotecontrol.h"
 
diff --git a/examples/help/remotecontrol/remotecontrol.h b/examples/help/remotecontrol/remotecontrol.h
index e440add3f..16bd3f33c 100644
--- a/examples/help/remotecontrol/remotecontrol.h
+++ b/examples/help/remotecontrol/remotecontrol.h
@@ -41,7 +41,7 @@
 #ifndef REMOTECONTROL_H
 #define REMOTECONTROL_H
 
-#include <QtGui/QMainWindow>
+#include <QtWidgets/QMainWindow>
 #include "ui_remotecontrol.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/examples/help/remotecontrol/remotecontrol.pro b/examples/help/remotecontrol/remotecontrol.pro
index 2212db040..79fb7c1be 100644
--- a/examples/help/remotecontrol/remotecontrol.pro
+++ b/examples/help/remotecontrol/remotecontrol.pro
@@ -1,4 +1,5 @@
 TEMPLATE   = app
+QT        += widgets
 
 HEADERS   += remotecontrol.h
 SOURCES   += main.cpp \
diff --git a/examples/help/simpletextviewer/assistant.cpp b/examples/help/simpletextviewer/assistant.cpp
index 2223b4bbf..392f2260e 100644
--- a/examples/help/simpletextviewer/assistant.cpp
+++ b/examples/help/simpletextviewer/assistant.cpp
@@ -43,7 +43,7 @@
 #include <QtCore/QLibraryInfo>
 #include <QtCore/QProcess>
 
-#include <QtGui/QMessageBox>
+#include <QtWidgets/QMessageBox>
 
 #include "assistant.h"
 
diff --git a/examples/help/simpletextviewer/findfiledialog.cpp b/examples/help/simpletextviewer/findfiledialog.cpp
index 086be965d..bbaf038d7 100644
--- a/examples/help/simpletextviewer/findfiledialog.cpp
+++ b/examples/help/simpletextviewer/findfiledialog.cpp
@@ -39,15 +39,15 @@
 ****************************************************************************/
 
 #include <QtCore/QDir>
-#include <QtGui/QLayout>
-#include <QtGui/QComboBox>
-#include <QtGui/QTreeWidget>
-#include <QtGui/QLayout>
-#include <QtGui/QFileDialog>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QToolButton>
-#include <QtGui/QPushButton>
-#include <QtGui/QLabel>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QTreeWidget>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QDialogButtonBox>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QLabel>
 
 #include "findfiledialog.h"
 #include "assistant.h"
diff --git a/examples/help/simpletextviewer/findfiledialog.h b/examples/help/simpletextviewer/findfiledialog.h
index 71abd4aac..9df00edbd 100644
--- a/examples/help/simpletextviewer/findfiledialog.h
+++ b/examples/help/simpletextviewer/findfiledialog.h
@@ -41,7 +41,7 @@
 #ifndef FINDFILEDIALOG_H
 #define FINDFILEDIALOG_H
 
-#include <QtGui/QDialog>
+#include <QtWidgets/QDialog>
 
 QT_BEGIN_NAMESPACE
 class QComboBox;
diff --git a/examples/help/simpletextviewer/main.cpp b/examples/help/simpletextviewer/main.cpp
index 4c8aab9c8..8780e0d3a 100644
--- a/examples/help/simpletextviewer/main.cpp
+++ b/examples/help/simpletextviewer/main.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 
 #include "mainwindow.h"
 
diff --git a/examples/help/simpletextviewer/mainwindow.cpp b/examples/help/simpletextviewer/mainwindow.cpp
index 61fbdf3cb..c84c78c2f 100644
--- a/examples/help/simpletextviewer/mainwindow.cpp
+++ b/examples/help/simpletextviewer/mainwindow.cpp
@@ -39,11 +39,11 @@
 ****************************************************************************/
 
 #include <QtCore/QLibraryInfo>
-#include <QtGui/QApplication>
-#include <QtGui/QAction>
-#include <QtGui/QMenu>
-#include <QtGui/QMenuBar>
-#include <QtGui/QMessageBox>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QMessageBox>
 
 #include "mainwindow.h"
 #include "findfiledialog.h"
diff --git a/examples/help/simpletextviewer/mainwindow.h b/examples/help/simpletextviewer/mainwindow.h
index 4fab382f2..8c2f84123 100644
--- a/examples/help/simpletextviewer/mainwindow.h
+++ b/examples/help/simpletextviewer/mainwindow.h
@@ -41,7 +41,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QtGui/QMainWindow>
+#include <QtWidgets/QMainWindow>
 
 class Assistant;
 class TextEdit;
diff --git a/examples/help/simpletextviewer/simpletextviewer.pro b/examples/help/simpletextviewer/simpletextviewer.pro
index b51c141c0..5ef14c44a 100644
--- a/examples/help/simpletextviewer/simpletextviewer.pro
+++ b/examples/help/simpletextviewer/simpletextviewer.pro
@@ -8,6 +8,8 @@ SOURCES       = main.cpp \
                 assistant.cpp \
                 textedit.cpp
 
+QT += widgets
+
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/qttools/help/simpletextviewer
 sources.files = $$SOURCES $$HEADERS $$RESOURCES documentation *.pro
diff --git a/examples/help/simpletextviewer/textedit.h b/examples/help/simpletextviewer/textedit.h
index b9ecabd1d..6222ac189 100644
--- a/examples/help/simpletextviewer/textedit.h
+++ b/examples/help/simpletextviewer/textedit.h
@@ -42,7 +42,7 @@
 #define TEXTEDIT_H
 
 #include <QtCore/QUrl>
-#include <QtGui/QTextEdit>
+#include <QtWidgets/QTextEdit>
 
 class TextEdit : public QTextEdit
 {