Merge remote-tracking branch 'origin/refactor' into master

Conflicts:
	src/assistant/help/help.pro
	src/designer/src/components/formeditor/formwindow.cpp
	src/designer/src/components/formeditor/formwindow_dnditem.cpp
	src/designer/src/components/formeditor/layout_propertysheet.cpp
	src/designer/src/components/formeditor/qdesigner_resource.cpp
	src/designer/src/components/lib/lib.pro
	src/designer/src/components/signalsloteditor/signalsloteditor.cpp
	src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
	src/designer/src/components/widgetbox/widgetbox_dnditem.cpp
	src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
	src/designer/src/lib/lib.pro
	src/designer/src/lib/shared/qdesigner_formbuilder.cpp
	src/designer/src/lib/shared/qdesigner_propertysheet.cpp
	src/designer/src/lib/shared/shared.pri
	src/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro
	src/linguist/lupdate/qdeclarative.cpp
	src/linguist/shared/profileevaluator.cpp
	src/linguist/shared/qph.cpp
	src/linguist/shared/ts.cpp
	src/qtconfig/mainwindow.cpp
	src/shared/qtgradienteditor/qtcolorline.cpp
	src/shared/qtgradienteditor/qtgradientwidget.cpp
	sync.profile

Change-Id: I53f0ce4efae4179257cbf3aab87e1af12c3aa4ff

17 files changed, 30 insertions, 27 deletions

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
 {