From aa566e72972fd3b56f1c004153eb53792bdbfb10 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Sat, 7 May 2011 21:24:37 +0200
Subject: [PATCH] some build fixes

---
 src/modules/qt_opengl.pri            |  2 +-
 src/modules/qt_widgets.pri           |  4 +--
 src/opengl/opengl.pro                |  2 +-
 src/opengl/qgl.h                     |  2 +-
 src/opengl/qgraphicsshadereffect.cpp |  4 +--
 sync.profile                         |  3 ++-
 tools/uilib/abstractformbuilder.cpp  | 38 ++--------------------------
 tools/uilib/abstractformbuilder.h    |  2 +-
 tools/uilib/customwidget.h           |  2 +-
 tools/uilib/properties_p.h           |  2 +-
 10 files changed, 14 insertions(+), 47 deletions(-)

diff --git a/src/modules/qt_opengl.pri b/src/modules/qt_opengl.pri
index b767a3ce12..a1080cb5a5 100644
--- a/src/modules/qt_opengl.pri
+++ b/src/modules/qt_opengl.pri
@@ -11,6 +11,6 @@ QT.opengl.sources = $$QT_MODULE_BASE/src/opengl
 QT.opengl.libs = $$QT_MODULE_LIB_BASE
 QT.opengl.plugins = $$QT_MODULE_PLUGIN_BASE
 QT.opengl.imports = $$QT_MODULE_IMPORT_BASE
-QT.opengl.depends = core gui
+QT.opengl.depends = core gui widgets
 QT.opengl.CONFIG = opengl
 QT.opengl.DEFINES = QT_OPENGL_LIB
diff --git a/src/modules/qt_widgets.pri b/src/modules/qt_widgets.pri
index 78752e131e..c86bc12021 100644
--- a/src/modules/qt_widgets.pri
+++ b/src/modules/qt_widgets.pri
@@ -3,12 +3,12 @@ QT.widgets.MAJOR_VERSION = 4
 QT.widgets.MINOR_VERSION = 8
 QT.widgets.PATCH_VERSION = 0
 
-QT.widgets.name = QtGui
+QT.widgets.name = QtWidgets
 QT.widgets.includes = $$QT_MODULE_INCLUDE_BASE/QtWidgets
 QT.widgets.private_includes = $$QT_MODULE_INCLUDE_BASE/QtWidgets/$$QT.widgets.VERSION
 QT.widgets.sources = $$QT_MODULE_BASE/src/widgets
 QT.widgets.libs = $$QT_MODULE_LIB_BASE
 QT.widgets.plugins = $$QT_MODULE_PLUGIN_BASE
 QT.widgets.imports = $$QT_MODULE_IMPORT_BASE
-QT.widgets.depends = core network
+QT.widgets.depends = core network gui
 QT.widgets.DEFINES = QT_GUI_LIB
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index 2aee4333ef..2612368fb3 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -1,6 +1,6 @@
 TARGET     = QtOpenGL
 QPRO_PWD   = $$PWD
-QT         = core-private gui-private
+QT         = core-private gui-private widgets-private
 
 CONFIG += module
 MODULE_PRI = ../modules/qt_opengl.pri
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h
index 730e52ba8f..30a8a32cfe 100644
--- a/src/opengl/qgl.h
+++ b/src/opengl/qgl.h
@@ -42,7 +42,7 @@
 #ifndef QGL_H
 #define QGL_H
 
-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>
 #include <QtGui/qpaintengine.h>
 #include <QtOpenGL/qglcolormap.h>
 #include <QtCore/qmap.h>
diff --git a/src/opengl/qgraphicsshadereffect.cpp b/src/opengl/qgraphicsshadereffect.cpp
index 6983d9057e..859af2045f 100644
--- a/src/opengl/qgraphicsshadereffect.cpp
+++ b/src/opengl/qgraphicsshadereffect.cpp
@@ -46,8 +46,8 @@
 #define QGL_HAVE_CUSTOM_SHADERS 1
 #endif
 #include <QtGui/qpainter.h>
-#include <QtGui/qgraphicsitem.h>
-#include <QtGui/private/qgraphicseffect_p.h>
+#include <QtWidgets/qgraphicsitem.h>
+#include <private/qgraphicseffect_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/sync.profile b/sync.profile
index f34f1ae612..dd88acc07e 100644
--- a/sync.profile
+++ b/sync.profile
@@ -70,6 +70,7 @@
     "QtOpenGL" => {
         "QtCore" => "THIS_REPOSITORY",
         "QtGui" => "THIS_REPOSITORY",
+        "QtWidgets" => "THIS_REPOSITORY",
     },
     "QtXml" => {
         "QtCore" => "THIS_REPOSITORY",
@@ -89,10 +90,10 @@
     },
     "QtGui" => {
         "QtCore" => "THIS_REPOSITORY",
-        "QtGui" => "THIS_REPOSITORY",
     },
     "QtWidgets" => {
         "QtCore" => "THIS_REPOSITORY",
+        "QtGui" => "THIS_REPOSITORY",
     },
     "QtUiTools" => {
         "QtCore" => "THIS_REPOSITORY",
diff --git a/tools/uilib/abstractformbuilder.cpp b/tools/uilib/abstractformbuilder.cpp
index ecb43db89f..ad48031e75 100644
--- a/tools/uilib/abstractformbuilder.cpp
+++ b/tools/uilib/abstractformbuilder.cpp
@@ -55,48 +55,14 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/QCoreApplication>
 
-#include <QtGui/QAction>
-#include <QtGui/QActionGroup>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QComboBox>
-#include <QtGui/QFontComboBox>
-#include <QtGui/QGridLayout>
-#ifndef QT_NO_FORMLAYOUT
-#  include <QtGui/QFormLayout>
-#endif
-#include <QtGui/QIcon>
-#include <QtGui/QListWidget>
-#include <QtGui/QMainWindow>
-#include <QtGui/QPixmap>
-#include <QtGui/QStatusBar>
-#include <QtGui/QTreeWidget>
-#include <QtGui/QTableWidget>
-#include <QtGui/QWidget>
-#include <QtGui/QSplitter>
-#include <QtGui/QScrollArea>
-#include <QtGui/QAbstractButton>
-#include <QtGui/QAbstractItemView>
-#include <QtGui/QHeaderView>
+#include <QtGui/QtGui>
+#include <QtWidgets/QtWidgets>
 #ifndef QFORMINTERNAL_NAMESPACE
 #  include <private/qlayout_p.h> // Compiling within Designer
 #endif
 
 #include <QtXml/QXmlStreamReader>
 
-#include <QtGui/QDialog>
-
-// containers
-#include <QtGui/QToolBox>
-#include <QtGui/QStackedWidget>
-#include <QtGui/QTabWidget>
-#include <QtGui/QToolBar>
-#include <QtGui/QMenuBar>
-#include <QtGui/QDockWidget>
-#include <QtGui/QMdiArea>
-#include <QtGui/QWorkspace>
-#include <QtGui/QWizard>
-#include <QtGui/QWizardPage>
-
 #include <QtCore/qdebug.h>
 
 #include <limits.h>
diff --git a/tools/uilib/abstractformbuilder.h b/tools/uilib/abstractformbuilder.h
index 2f99b36515..14f3ffa66c 100644
--- a/tools/uilib/abstractformbuilder.h
+++ b/tools/uilib/abstractformbuilder.h
@@ -48,7 +48,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QDir>
 
-#include <QtGui/QSizePolicy>
+#include <QtWidgets/QSizePolicy>
 #include <QtGui/QPalette>
 
 QT_BEGIN_HEADER
diff --git a/tools/uilib/customwidget.h b/tools/uilib/customwidget.h
index 0a04c93c6d..915cb9d706 100644
--- a/tools/uilib/customwidget.h
+++ b/tools/uilib/customwidget.h
@@ -45,7 +45,7 @@
 #include "extension.h"
 #include <QtCore/QObject>
 #include <QtCore/QString>
-#include <QtGui/QIcon>
+#include <QtWidgets/QIcon>
 
 QT_BEGIN_HEADER
 
diff --git a/tools/uilib/properties_p.h b/tools/uilib/properties_p.h
index e57f9ed2ed..89e19ae43b 100644
--- a/tools/uilib/properties_p.h
+++ b/tools/uilib/properties_p.h
@@ -60,7 +60,7 @@
 #include <QtCore/QLocale>
 #include <QtCore/QCoreApplication>
 
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
 
 #include "formbuilderextra_p.h"