Polish Qt Designer plugins and QtUiTools.

Do not use module includes, fix warnings about obsolete
CONFIG+=designer.

Change-Id: I6277f0e96a35171f22dced1a434a2c14c1e98d60
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

6 files changed, 33 insertions, 12 deletions

diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp
index 319059cb9..2ed0d2c34 100644
--- a/src/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -56,8 +56,30 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/QCoreApplication>
 
-#include <QtGui/QtGui>
-#include <QtWidgets/QtWidgets>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QStatusBar>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QMdiArea>
+#include <QtWidgets/QDockWidget>
+#include <QtWidgets/QWizard>
+#include <QtWidgets/QStackedWidget>
+#include <QtWidgets/QToolBox>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QSplitter>
+#include <QtWidgets/QButtonGroup>
+#include <QtWidgets/QBoxLayout>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QScrollArea>
+#include <QtWidgets/QTreeWidget>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QTableWidget>
+#include <QtWidgets/QFontComboBox>
+#include <QtWidgets/QPushButton>
 #ifndef QFORMINTERNAL_NAMESPACE
 #  include <private/qlayout_p.h> // Compiling within Designer
 #endif
diff --git a/src/designer/src/lib/uilib/formbuilder.cpp b/src/designer/src/lib/uilib/formbuilder.cpp
index 8981af13b..2d7bb7f93 100644
--- a/src/designer/src/lib/uilib/formbuilder.cpp
+++ b/src/designer/src/lib/uilib/formbuilder.cpp
@@ -44,9 +44,7 @@
 #include "formbuilderextra_p.h"
 #include "ui4_p.h"
 
-#include <QtGui/QtGui>
 #include <QtWidgets/QtWidgets>
-#include <QtCore/QCoreApplication>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/plugins/activeqt/activeqt.pro b/src/designer/src/plugins/activeqt/activeqt.pro
index 7902c95cb..ebe19e6a0 100644
--- a/src/designer/src/plugins/activeqt/activeqt.pro
+++ b/src/designer/src/plugins/activeqt/activeqt.pro
@@ -1,7 +1,7 @@
 TEMPLATE    = lib
 TARGET      = qaxwidget
 DESTDIR = $$QT.designer.plugins/designer
-CONFIG     += qaxcontainer qt warn_on plugin designer
+CONFIG     += qaxcontainer qt warn_on plugin
 QT         += widgets designer-private
 
 include(../plugins.pri)
diff --git a/src/designer/src/plugins/plugins.pri b/src/designer/src/plugins/plugins.pri
index c0c7a8fa8..a803d9454 100644
--- a/src/designer/src/plugins/plugins.pri
+++ b/src/designer/src/plugins/plugins.pri
@@ -1,4 +1,4 @@
-CONFIG += designer
+QT += designer
 !build_pass:contains(QT_CONFIG, build_all): CONFIG += release
 DESTDIR = $$QT.designer.plugins/designer
 contains(TEMPLATE, ".*lib"):TARGET = $$qtLibraryTarget($$TARGET)
diff --git a/src/designer/src/plugins/tools/view3d/view3d.cpp b/src/designer/src/plugins/tools/view3d/view3d.cpp
index 41e8f708c..39d9c31c1 100644
--- a/src/designer/src/plugins/tools/view3d/view3d.cpp
+++ b/src/designer/src/plugins/tools/view3d/view3d.cpp
@@ -39,15 +39,16 @@
 **
 ****************************************************************************/
 
-#include <QtCore>
-#include <QtGui>
-#include <QtOpenGL>
-
 #include "abstractformeditor.h"
 #include "abstractmetadatabase.h"
 #include "abstractformwindow.h"
 #include "view3d.h"
 
+#include <QKeyEvent>
+#include <QGLFunctions>
+#include <QApplication>
+#include <QGridLayout>
+
 #define SELECTION_BUFSIZE 512
 
 #ifndef GL_TEXTURE_MAX_ANISOTROPY_EXT
@@ -279,7 +280,7 @@ void QView3DWidget::paintGL()
     glPopAttrib();
 }
 
-QWidget *QView3DWidget::widgetAt(const QPoint &pos)
+QWidget *QView3DWidget::widgetAt(const QPoint & /* pos */)
 {
     makeCurrent();
     GLuint selectBuf[SELECTION_BUFSIZE];
diff --git a/src/designer/src/plugins/tools/view3d/view3d.pro b/src/designer/src/plugins/tools/view3d/view3d.pro
index 82baf4750..7882c476e 100644
--- a/src/designer/src/plugins/tools/view3d/view3d.pro
+++ b/src/designer/src/plugins/tools/view3d/view3d.pro
@@ -1,7 +1,7 @@
 
 TEMPLATE = lib
 QT      += opengl widgets
-CONFIG  += qt warn_on plugin designer
+CONFIG  += qt warn_on plugin
 TARGET = view3d
 
 include(../../plugins.pri)