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: some build fixes

---
 tools/uilib/abstractformbuilder.cpp | 38 ++-----------------------------------
 tools/uilib/abstractformbuilder.h   |  2 +-
 tools/uilib/customwidget.h          |  2 +-
 tools/uilib/properties_p.h          |  2 +-
 4 files changed, 5 insertions(+), 39 deletions(-)

(limited to 'tools')

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"
 
-- 
cgit v1.2.3