Get designer to compile again.

And it actually runs! ;-)

Change-Id: I593991e3b5d423189f00d1bd9c51daca6b9e9bd0
Reviewed-on: http://codereview.qt-project.org/4831
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

19 files changed, 53 insertions, 61 deletions

diff --git a/modules/qt_designercomponents.pri b/modules/qt_designercomponents.pri
new file mode 100644
index 000000000..a453c7949
--- /dev/null
+++ b/modules/qt_designercomponents.pri
@@ -0,0 +1,16 @@
+QT.designercomponents.VERSION = 5.0.0
+QT.designercomponents.MAJOR_VERSION = 5
+QT.designercomponents.MINOR_VERSION = 0
+QT.designercomponents.PATCH_VERSION = 0
+
+QT.designercomponents.name = QtDesignerComponents
+QT.designercomponents.bins = $$QT_MODULE_BIN_BASE
+QT.designercomponents.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDesignerComponents
+QT.designercomponents.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDesignerComponents/$$QT.designercomponents.VERSION
+QT.designercomponents.sources = $$QT_MODULE_BASE/src/designer/src/components/lib
+QT.designercomponents.libs = $$QT_MODULE_LIB_BASE
+QT.designercomponents.plugins = $$QT_MODULE_PLUGIN_BASE
+QT.designercomponents.imports = $$QT_MODULE_IMPORT_BASE
+QT.designercomponents.depends = core xml gui widgets
+
+QT_CONFIG += designercomponents
diff --git a/src/designer/data/generate_impl.xsl b/src/designer/data/generate_impl.xsl
index a22862e0c..440d59e6f 100644
--- a/src/designer/data/generate_impl.xsl
+++ b/src/designer/data/generate_impl.xsl
@@ -1131,7 +1131,7 @@
 **
 ****************************************************************************/
 </xsl:text>
-        <xsl:text>#include "ui4_p.h"&endl;</xsl:text>
+        <xsl:text>#include "private/ui4_p.h"&endl;</xsl:text>
         <xsl:text>&endl;</xsl:text>
         <xsl:text>#ifdef QUILOADER_QDOM_READ&endl;</xsl:text>
         <xsl:text>#include &lt;QtXml/QDomElement&gt;&endl;</xsl:text>
diff --git a/src/designer/src/components/component.pri b/src/designer/src/components/component.pri
index 1dd8cf0b4..a5b02c31f 100644
--- a/src/designer/src/components/component.pri
+++ b/src/designer/src/components/component.pri
@@ -1,3 +1,2 @@
 load(qt_module)
 TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
-INCLUDEPATH += $$QT_SOURCE_TREE/tools/uilib
diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp
index e9600da27..fc06810a5 100644
--- a/src/designer/src/components/formeditor/formwindow.cpp
+++ b/src/designer/src/components/formeditor/formwindow.cpp
@@ -69,7 +69,7 @@
 #include <qdesigner_objectinspector_p.h>
 #include <connectionedit_p.h>
 #include <actionprovider_p.h>
-#include <ui4_p.h>
+#include <private/ui4_p.h>
 #include <deviceprofile_p.h>
 #include <shared_settings_p.h>
 #include <grid_p.h>
diff --git a/src/designer/src/components/formeditor/formwindow_dnditem.cpp b/src/designer/src/components/formeditor/formwindow_dnditem.cpp
index 8f16f3830..d93219991 100644
--- a/src/designer/src/components/formeditor/formwindow_dnditem.cpp
+++ b/src/designer/src/components/formeditor/formwindow_dnditem.cpp
@@ -42,7 +42,7 @@
 #include "formwindow_dnditem.h"
 #include "formwindow.h"
 
-#include <ui4_p.h>
+#include <private/ui4_p.h>
 #include <qdesigner_resource.h>
 #include <qtresourcemodel_p.h>
 
diff --git a/src/designer/src/components/formeditor/layout_propertysheet.cpp b/src/designer/src/components/formeditor/layout_propertysheet.cpp
index 72e709e8a..384abf514 100644
--- a/src/designer/src/components/formeditor/layout_propertysheet.cpp
+++ b/src/designer/src/components/formeditor/layout_propertysheet.cpp
@@ -46,9 +46,9 @@
 #include <QtDesigner/QDesignerFormEditorInterface>
 
 // shared
-#include <ui4_p.h>
+#include <private/ui4_p.h>
 #include <qlayout_widget_p.h>
-#include <formbuilderextra_p.h>
+#include <private/formbuilderextra_p.h>
 
 #include <QtWidgets/QFormLayout>
 
diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp
index 959a50f6d..d9a6709cb 100644
--- a/src/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -55,10 +55,10 @@
 #include "qwizard_container.h"
 #include "layout_propertysheet.h"
 
-#include <ui4_p.h>
-#include <formbuilderextra_p.h>
-#include <resourcebuilder_p.h>
-#include <textbuilder_p.h>
+#include <private/ui4_p.h>
+#include <private/formbuilderextra_p.h>
+#include <private/resourcebuilder_p.h>
+#include <private/textbuilder_p.h>
 #include <qdesigner_widgetitem_p.h>
 
 // shared
@@ -74,7 +74,6 @@
 
 #include <qlayout_widget_p.h>
 #include <qdesigner_utils_p.h>
-#include <ui4_p.h>
 
 // sdk
 #include <QtDesigner/QDesignerPropertySheetExtension>
diff --git a/src/designer/src/components/lib/lib.pro b/src/designer/src/components/lib/lib.pro
index 2a394dc52..62354d0f5 100644
--- a/src/designer/src/components/lib/lib.pro
+++ b/src/designer/src/components/lib/lib.pro
@@ -1,23 +1,19 @@
+MODULE = designercomponents
 load(qt_module)
 
 TEMPLATE = lib
 TARGET = QtDesignerComponents
-contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
-CONFIG += qt depend_prl no_objective_c designer
-QT += gui-private
-win32|mac: CONFIG += debug_and_release
-DESTDIR = $$QT_BUILD_TREE/lib
-!wince*:DLLDESTDIR = $$QT.designer.bins
-QT += widgets widgets-private designer-private uilib-private
+
+QT += gui-private widgets widgets-private designer designer-private
+
+CONFIG += module
+MODULE_PRI = ../../../../modules/qt_designercomponents.pri
+
+load(qt_module_config)
 
 # QtDesignerComponents uses
 DEFINES += QT_STATICPLUGIN
-
-isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.3.0
-} else {
-   VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
-}
+DEFINES += QDESIGNER_COMPONENTS_LIBRARY
 
 include($$QT_SOURCE_TREE/src/qt_targets.pri)
 QMAKE_TARGET_PRODUCT = Designer
@@ -37,19 +33,10 @@ mac:!static:contains(QT_CONFIG, qt_framework) {
 
 SOURCES += qdesigner_components.cpp
 
-!contains(CONFIG, static) {
-    DEFINES += QDESIGNER_COMPONENTS_LIBRARY
-    CONFIG += dll
-    LIBS += -lQtDesigner
-} else {
-    DEFINES += QT_DESIGNER_STATIC
-}
-
 INCLUDEPATH += . .. \
     $$PWD/../../lib/components \
     $$PWD/../../lib/sdk \
     $$PWD/../../lib/extension \
-    $$QT_SOURCE_TREE/tools/uilib \
     $$PWD/../../lib/shared
 
 include(../propertyeditor/propertyeditor.pri)
@@ -70,10 +57,3 @@ unix|win32-g++* {
     QMAKE_PKGCONFIG_REQUIRES = QtCore QtDesigner QtGui QtXml
     contains(QT_CONFIG, script): QMAKE_PKGCONFIG_REQUIRES += QtScript
 }
-
-target.path=$$[QT_INSTALL_LIBS]
-INSTALLS        += target
-win32 {
-    dlltarget.path=$$[QT_INSTALL_BINS]
-    INSTALLS += dlltarget
-}
diff --git a/src/designer/src/components/propertyeditor/fontpropertymanager.cpp b/src/designer/src/components/propertyeditor/fontpropertymanager.cpp
index d04bfe6e2..c547a8108 100644
--- a/src/designer/src/components/propertyeditor/fontpropertymanager.cpp
+++ b/src/designer/src/components/propertyeditor/fontpropertymanager.cpp
@@ -52,7 +52,7 @@
 #include <QtCore/QDebug>
 #include <QtCore/QFile>
 #include <QtCore/QTextStream>
-#include <QtXml/QXmlStreamReader>
+#include <QtCore/QXmlStreamReader>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor.cpp b/src/designer/src/components/signalsloteditor/signalsloteditor.cpp
index 77b9fbe96..a69b1b05f 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditor.cpp
+++ b/src/designer/src/components/signalsloteditor/signalsloteditor.cpp
@@ -45,7 +45,7 @@
 #include "signalslot_utils_p.h"
 
 #include <metadatabase_p.h>
-#include <ui4_p.h>
+#include <private/ui4_p.h>
 #include <qdesigner_formwindowcommand_p.h>
 
 #include <QtDesigner/QDesignerFormWindowInterface>
diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp b/src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
index 559e9bc93..3c3f673e8 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
+++ b/src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
@@ -41,7 +41,7 @@
 
 #include "signalsloteditor_tool.h"
 #include "signalsloteditor.h"
-#include "ui4_p.h"
+#include "private/ui4_p.h"
 
 #include <QtDesigner/QDesignerFormWindowInterface>
 
diff --git a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
index c8568ecc5..1f88019ab 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
+++ b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
@@ -445,7 +445,7 @@ void InlineEditorModel::addTitle(const QString &title)
     const int cnt = rowCount();
     insertRows(cnt, 1);
     QModelIndex cat_idx = index(cnt, 0);
-    setData(cat_idx, title + QLatin1Char(':'), Qt::DisplayRole);
+    setData(cat_idx, QString(title + QLatin1Char(':')), Qt::DisplayRole);
     setData(cat_idx, TitleItem, Qt::UserRole);
     QFont font = QApplication::font();
     font.setBold(true);
diff --git a/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp b/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp
index 5964de8c3..fd0320f3e 100644
--- a/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp
+++ b/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp
@@ -40,13 +40,13 @@
 ****************************************************************************/
 
 #include "widgetbox_dnditem.h"
-#include "ui4_p.h"
+#include "private/ui4_p.h"
 
 #include <widgetfactory_p.h>
 #include <spacer_widget_p.h>
 #include <qdesigner_formbuilder_p.h>
 #include <qtresourcemodel_p.h>
-#include <formscriptrunner_p.h>
+#include <private/formscriptrunner_p.h>
 #include <formwindowbase_p.h>
 #include <qdesigner_utils_p.h>
 #include <qdesigner_dockwidget_p.h>
diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
index 6b84aa354..8f597215f 100644
--- a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
+++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
@@ -45,7 +45,7 @@
 // shared
 #include <iconloader_p.h>
 #include <sheet_delegate_p.h>
-#include <ui4_p.h>
+#include <private/ui4_p.h>
 #include <qdesigner_utils_p.h>
 #include <pluginmanager_p.h>
 
diff --git a/src/designer/src/designer/designer.pro b/src/designer/src/designer/designer.pro
index e922b688f..849335019 100644
--- a/src/designer/src/designer/designer.pro
+++ b/src/designer/src/designer/designer.pro
@@ -1,7 +1,7 @@
 load(qt_module)
 
 DESTDIR = $$QT.designer.bins
-QT += core-private widgets xml network designer-private uilib-private
+QT += core-private widgets xml network designer-private uilib-private printsupport
 
 CONFIG += module
 MODULE_PRI = ../../../../modules/qt_designer.pri
diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp
index c19abefc4..1e2eb65de 100644
--- a/src/designer/src/designer/qdesigner_actions.cpp
+++ b/src/designer/src/designer/qdesigner_actions.cpp
@@ -85,7 +85,7 @@
 #include <QtGui/QImage>
 #include <QtGui/QPixmap>
 #include <QtWidgets/QMdiSubWindow>
-#include <QtWidgets/QPrintDialog>
+#include <QtPrintSupport/QPrintDialog>
 #include <QtGui/QPainter>
 #include <QtGui/QTransform>
 #include <QtGui/QCursor>
diff --git a/src/designer/src/designer/qdesigner_actions.h b/src/designer/src/designer/qdesigner_actions.h
index 4bd4de95e..f295c9486 100644
--- a/src/designer/src/designer/qdesigner_actions.h
+++ b/src/designer/src/designer/qdesigner_actions.h
@@ -47,7 +47,7 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QPointer>
-#include <QtGui/QPrinter>
+#include <QtPrintSupport/QPrinter>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro
index 7219ad57f..0302c467b 100644
--- a/src/designer/src/lib/lib.pro
+++ b/src/designer/src/lib/lib.pro
@@ -14,17 +14,11 @@ load(qt_module_config)
 
 HEADERS += qtdesignerversion.h
 
-#!contains(CONFIG, static) {
-#    CONFIG += dll
-
-#    DEFINES += \
-#        QDESIGNER_SDK_LIBRARY \
-#        QDESIGNER_EXTENSION_LIBRARY \
-#        QDESIGNER_UILIB_LIBRARY \
-#        QDESIGNER_SHARED_LIBRARY
-#} else {
-#    DEFINES += QT_DESIGNER_STATIC
-#}
+DEFINES += \
+    QDESIGNER_SDK_LIBRARY \
+    QDESIGNER_EXTENSION_LIBRARY \
+    QDESIGNER_UILIB_LIBRARY \
+    QDESIGNER_SHARED_LIBRARY
 
 #mac frameworks
 mac:CONFIG += explicitlib
diff --git a/sync.profile b/sync.profile
index 8873defdd..260187a51 100644
--- a/sync.profile
+++ b/sync.profile
@@ -3,6 +3,7 @@
     "QtHelp" => "$basedir/src/assistant/help",
     "QtUiTools" => "$basedir/src/designer/src/uitools",
     "QtDesigner" => "$basedir/src/designer/src/lib",
+    "QtDesignerComponents" => "$basedir/src/designer/src/components/lib",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );
@@ -11,6 +12,7 @@
     "qthelpversion.h" => "QtHelpVersion",
     "qtuitoolsversion.h" => "QtUiToolsVersion",
     "qtdesignerversion.h" => "QtDesigner",
+    "qtdesignercomponentsversion.h" => "QtDesignerComponents",
 );
 %mastercontent = (
     "sql" => "#include <QtSql/QtSql>\n",
@@ -21,6 +23,7 @@
     "clucene" => "#include <QtCLucene/QtCLucene>\n",
     "help" => "#include <QtHelp/QtHelp>\n",
     "designer" => "#include <QtDesigner/QtDesigner>\n",
+    "designercomponents" => "#include <QtDesignerComponents/QtDesignerComponents>\n",
     "uitools" => "#include <QtUiTools/QtUiTools>\n",
 );
 %modulepris = (
@@ -28,6 +31,7 @@
     "QtHelp" => "$basedir/modules/qt_help.pri",
     "QtUiTools" => "$basedir/modules/qt_uitools.pri",
     "QtDesigner" => "$basedir/modules/qt_designer.pri",
+    "QtDesignerComponents" => "$basedir/modules/qt_designercomponents.pri",
 );
 %dependencies = (
     	"qtbase" => "refs/heads/master",