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


From 9474f82f8a4ca4abfc349c17debd84f26148fc20 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Sat, 7 May 2011 22:25:30 +0200
Subject: QTDIR/src compiles again

---
 tools/uilib/formbuilder.cpp      | 1 +
 tools/uilib/formbuilderextra.cpp | 6 +++---
 tools/uilib/formscriptrunner.cpp | 2 +-
 tools/uilib/properties.cpp       | 6 +++---
 tools/uilib/resourcebuilder.cpp  | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'tools')

diff --git a/tools/uilib/formbuilder.cpp b/tools/uilib/formbuilder.cpp
index b997cc9bc0..ee5452561f 100644
--- a/tools/uilib/formbuilder.cpp
+++ b/tools/uilib/formbuilder.cpp
@@ -45,6 +45,7 @@
 #include "ui4_p.h"
 
 #include <QtGui/QtGui>
+#include <QtWidgets/QtWidgets>
 #include <QtCore/QCoreApplication>
 
 QT_BEGIN_NAMESPACE
diff --git a/tools/uilib/formbuilderextra.cpp b/tools/uilib/formbuilderextra.cpp
index ecc62886b9..75118a1a8b 100644
--- a/tools/uilib/formbuilderextra.cpp
+++ b/tools/uilib/formbuilderextra.cpp
@@ -45,9 +45,9 @@
 #include "textbuilder_p.h"
 #include "ui4_p.h"
 
-#include <QtGui/QLabel>
-#include <QtGui/QBoxLayout>
-#include <QtGui/QGridLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QBoxLayout>
+#include <QtWidgets/QGridLayout>
 
 #include <QtCore/QVariant>
 #include <QtCore/qdebug.h>
diff --git a/tools/uilib/formscriptrunner.cpp b/tools/uilib/formscriptrunner.cpp
index e349f6b318..fdc4201aec 100644
--- a/tools/uilib/formscriptrunner.cpp
+++ b/tools/uilib/formscriptrunner.cpp
@@ -44,7 +44,7 @@
 #include "ui4_p.h"
 
 #include <QtScript/QScriptEngine>
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
 #include <QtCore/QDebug>
 #include <QtCore/QCoreApplication>
 
diff --git a/tools/uilib/properties.cpp b/tools/uilib/properties.cpp
index 67f4d11d22..9bf530b84c 100644
--- a/tools/uilib/properties.cpp
+++ b/tools/uilib/properties.cpp
@@ -49,11 +49,11 @@
 #include <QtCore/QUrl>
 #include <QtCore/qdebug.h>
 
-#include <QtGui/QIcon>
+#include <QtWidgets/QIcon>
 #include <QtGui/QPixmap>
 #include <QtGui/QFont>
-#include <QtGui/QFrame>
-#include <QtGui/QAbstractScrollArea>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QAbstractScrollArea>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/tools/uilib/resourcebuilder.cpp b/tools/uilib/resourcebuilder.cpp
index 0ea5d4cf75..3d59ef2c23 100644
--- a/tools/uilib/resourcebuilder.cpp
+++ b/tools/uilib/resourcebuilder.cpp
@@ -46,7 +46,7 @@
 #include <QtCore/QDir>
 #include <QtCore/QDebug>
 #include <QtGui/QPixmap>
-#include <QtGui/QIcon>
+#include <QtWidgets/QIcon>
 
 QT_BEGIN_NAMESPACE
 
-- 
cgit v1.2.3


From 83375db73374e160de0810ede79fab77a286ad74 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Tue, 31 May 2011 11:10:44 +0200
Subject: configure.exe: Remove QT3_SUPPORT.

As it is causing compile problems.
---
 tools/configure/configureapp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 6857bdeb7d..098554d0ff 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -337,7 +337,7 @@ Configure::Configure(int& argc, char** argv)
     dictionary[ "LIBMNG" ]          = "auto";
     dictionary[ "FREETYPE" ]        = "no";
 
-    dictionary[ "QT3SUPPORT" ]      = "yes";
+    dictionary[ "QT3SUPPORT" ]      = "no";
     dictionary[ "ACCESSIBILITY" ]   = "yes";
     dictionary[ "OPENGL" ]          = "yes";
     dictionary[ "OPENVG" ]          = "no";
-- 
cgit v1.2.3


From a863eb1c7bbd5d40a741151f811bd7c62cf51e2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Thu, 1 Sep 2011 10:48:23 +0200
Subject: Compile fix.

uilib includes QtGui and QtWidgets headers, so should explicitly add gui
and widgets in the .pri file.

Change-Id: I5f1e80d1379cb5389287df73d6070fd8ff712a3b
Reviewed-on: http://codereview.qt.nokia.com/4055
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
---
 tools/uilib/uilib.pri | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tools')

diff --git a/tools/uilib/uilib.pri b/tools/uilib/uilib.pri
index 2072fbce8f..75904c2f66 100644
--- a/tools/uilib/uilib.pri
+++ b/tools/uilib/uilib.pri
@@ -4,6 +4,8 @@ INCLUDEPATH += $$PWD
 DEFINES += QT_DESIGNER
 !contains(QT_CONFIG, script): DEFINES += QT_FORMBUILDER_NO_SCRIPT
 
+QT += gui widgets
+
 # Input
 HEADERS += \
     $$PWD/ui4_p.h \
-- 
cgit v1.2.3