Designer: Fix more includes, remove usage of QT_SOURCE_TREE.

18 files changed, 36 insertions, 36 deletions

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 7429c2134..1d9c01cf6 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 <deviceprofile_p.h>
 #include <shared_settings_p.h>
 #include <grid_p.h>
@@ -81,6 +81,8 @@
 #include <QtDesigner/QDesignerContainerExtension>
 #include <QtDesigner/QDesignerTaskMenuExtension>
 #include <QtDesigner/QDesignerWidgetBoxInterface>
+#include <QtDesigner/private/ui4_p.h>
+
 #include <abstractdialoggui_p.h>
 
 #include <QtCore/QtDebug>
diff --git a/src/designer/src/components/formeditor/formwindow_dnditem.cpp b/src/designer/src/components/formeditor/formwindow_dnditem.cpp
index 107257db1..96ce11463 100644
--- a/src/designer/src/components/formeditor/formwindow_dnditem.cpp
+++ b/src/designer/src/components/formeditor/formwindow_dnditem.cpp
@@ -42,11 +42,11 @@
 #include "formwindow_dnditem.h"
 #include "formwindow.h"
 
-#include <ui4_p.h>
 #include <qdesigner_resource.h>
 #include <qtresourcemodel_p.h>
 
 #include <QtDesigner/QDesignerFormEditorInterface>
+#include <QtDesigner/private/ui4_p.h>
 
 #include <QtGui/QLabel>
 #include <QtGui/QPixmap>
diff --git a/src/designer/src/components/formeditor/layout_propertysheet.cpp b/src/designer/src/components/formeditor/layout_propertysheet.cpp
index d9c7e89c9..f8803422a 100644
--- a/src/designer/src/components/formeditor/layout_propertysheet.cpp
+++ b/src/designer/src/components/formeditor/layout_propertysheet.cpp
@@ -44,11 +44,12 @@
 // sdk
 #include <QtDesigner/QExtensionManager>
 #include <QtDesigner/QDesignerFormEditorInterface>
-
 // shared
-#include <ui4_p.h>
+
 #include <qlayout_widget_p.h>
-#include <formbuilderextra_p.h>
+
+#include <QtDesigner/private/ui4_p.h>
+#include <QtDesigner/private/formbuilderextra_p.h>
 
 #include <QtGui/QFormLayout>
 
diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp
index 1d7b05567..2b6b13abf 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 <QtDesigner/private/ui4_p.h>
+#include <QtDesigner/private/formbuilderextra_p.h>
+#include <QtDesigner/private/resourcebuilder_p.h>
+#include <QtDesigner/private/textbuilder_p.h>
 #include <qdesigner_widgetitem_p.h>
 
 // shared
@@ -74,7 +74,8 @@
 
 #include <qlayout_widget_p.h>
 #include <qdesigner_utils_p.h>
-#include <ui4_p.h>
+
+#include <QtDesigner/private/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 7b033641c..eb9d31cba 100644
--- a/src/designer/src/components/lib/lib.pro
+++ b/src/designer/src/components/lib/lib.pro
@@ -4,7 +4,8 @@ TEMPLATE = lib
 TARGET = QtDesignerComponents
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 CONFIG += qt depend_prl no_objective_c designer
-QT += gui-private
+QT *= gui-private
+QT *= uilib-private
 win32|mac: CONFIG += debug_and_release
 DESTDIR = $$QT_BUILD_TREE/lib
 !wince*:DLLDESTDIR = $$QT.designer.bins
@@ -19,7 +20,7 @@ isEmpty(QT_MAJOR_VERSION) {
    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 }
 
-include($$QT_SOURCE_TREE/src/qt_targets.pri)
+load(qt_targets)
 QMAKE_TARGET_PRODUCT = Designer
 QMAKE_TARGET_DESCRIPTION = Graphical user interface designer.
 
@@ -49,7 +50,6 @@ INCLUDEPATH += . .. \
     $$PWD/../../lib/components \
     $$PWD/../../lib/sdk \
     $$PWD/../../lib/extension \
-    $$QT_SOURCE_TREE/tools/uilib \
     $$PWD/../../lib/shared
 
 include(../propertyeditor/propertyeditor.pri)
diff --git a/src/designer/src/components/objectinspector/objectinspector.pri b/src/designer/src/components/objectinspector/objectinspector.pri
index 565f78bdc..ee666acb0 100644
--- a/src/designer/src/components/objectinspector/objectinspector.pri
+++ b/src/designer/src/components/objectinspector/objectinspector.pri
@@ -1,7 +1,7 @@
 # --- The Find widget is also linked into the designer_shared library.
 #     Avoid conflict when linking statically
 contains(CONFIG, static) {
-    INCLUDEPATH *= $$QT_SOURCE_TREE/tools/shared/findwidget
+    INCLUDEPATH *= ../../../../shared/findwidget
 } else {
     include(../../../../shared/findwidget/findwidget.pri)
 }
diff --git a/src/designer/src/components/propertyeditor/propertyeditor.pri b/src/designer/src/components/propertyeditor/propertyeditor.pri
index bb1afdb94..cd1b67e5a 100644
--- a/src/designer/src/components/propertyeditor/propertyeditor.pri
+++ b/src/designer/src/components/propertyeditor/propertyeditor.pri
@@ -7,8 +7,8 @@ INCLUDEPATH += $$PWD
 # --- Property browser is also linked into the designer_shared library.
 #     Avoid conflict when linking statically
 contains(CONFIG, static) {
-    INCLUDEPATH *= $$QT_SOURCE_TREE/tools/shared/qtpropertybrowser
-    INCLUDEPATH *= $$QT_SOURCE_TREE/tools/shared/qtgradienteditor
+    INCLUDEPATH *= ../../../../shared/qtpropertybrowser
+    INCLUDEPATH *= ../../../../shared/qtgradienteditor
 } else {
     include(../../../../shared/qtpropertybrowser/qtpropertybrowser.pri)
     include(../../../../shared/qtgradienteditor/qtcolorbutton.pri)
diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor.cpp b/src/designer/src/components/signalsloteditor/signalsloteditor.cpp
index 8efe092e5..639c5259e 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditor.cpp
+++ b/src/designer/src/components/signalsloteditor/signalsloteditor.cpp
@@ -45,9 +45,9 @@
 #include "signalslot_utils_p.h"
 
 #include <metadatabase_p.h>
-#include <ui4_p.h>
 #include <qdesigner_formwindowcommand_p.h>
 
+#include <QtDesigner/private/ui4_p.h>
 #include <QtDesigner/QDesignerFormWindowInterface>
 #include <QtDesigner/QDesignerFormEditorInterface>
 #include <QtDesigner/QDesignerMetaDataBaseInterface>
diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp b/src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
index 4e6f923f2..26055a40b 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
+++ b/src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
@@ -41,8 +41,8 @@
 
 #include "signalsloteditor_tool.h"
 #include "signalsloteditor.h"
-#include "ui4_p.h"
 
+#include <QtDesigner/private/ui4_p.h>
 #include <QtDesigner/QDesignerFormWindowInterface>
 
 #include <QtGui/QAction>
diff --git a/src/designer/src/components/taskmenu/taskmenu.pri b/src/designer/src/components/taskmenu/taskmenu.pri
index 066b92980..7f8ceca96 100644
--- a/src/designer/src/components/taskmenu/taskmenu.pri
+++ b/src/designer/src/components/taskmenu/taskmenu.pri
@@ -1,7 +1,6 @@
 INCLUDEPATH += $$PWD \
     ../propertyeditor \
-    $$QT_BUILD_TREE/tools/designer/src/components/taskmenu \
-    $$QT_SOURCE_TREE/tools/shared/qtpropertybrowser
+    ../../../../shared/tools/shared/qtpropertybrowser
 
 FORMS += $$PWD/itemlisteditor.ui \
     $$PWD/treewidgeteditor.ui \
diff --git a/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp b/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp
index cb13424d9..82b3f3369 100644
--- a/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp
+++ b/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp
@@ -40,13 +40,11 @@
 ****************************************************************************/
 
 #include "widgetbox_dnditem.h"
-#include "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 <formwindowbase_p.h>
 #include <qdesigner_utils_p.h>
 #include <qdesigner_dockwidget_p.h>
@@ -55,6 +53,9 @@
 #include <QtDesigner/QDesignerFormEditorInterface>
 #include <QtDesigner/QDesignerFormWindowManagerInterface>
 
+#include <QtDesigner/private/ui4_p.h>
+#include <QtDesigner/private/formscriptrunner_p.h>
+
 #include <QtGui/QStyle>
 #include <QtGui/QApplication>
 
diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
index 4c0e8fec0..85724d171 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 <QtDesigner/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 529b78db7..6f961c097 100644
--- a/src/designer/src/designer/designer.pro
+++ b/src/designer/src/designer/designer.pro
@@ -16,7 +16,6 @@ INCLUDEPATH += \
     ../lib/sdk \
     ../lib/extension \
     ../lib/shared \
-    $$QT_SOURCE_TREE/tools/uilib \
     extra
 
 QMAKE_LIBDIR += ../../lib ../../../../lib
diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro
index 8c0876648..42882c28a 100644
--- a/src/designer/src/lib/lib.pro
+++ b/src/designer/src/lib/lib.pro
@@ -13,15 +13,11 @@ INCLUDEPATH += $$QT.designer.includes \
                $$QT.designer.private_includes \
                $$QT.designer.private_includes/QtDesigner
 
-isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.3.0
-} else {
-   VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
-}
+VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 
 unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtXml
 
-include($$QT_SOURCE_TREE/src/qt_targets.pri)
+load(qt_targets)
 
 HEADERS += qtdesignerversion.h
 
@@ -68,8 +64,7 @@ mac:!static:contains(QT_CONFIG, qt_framework) {
 
 include(extension/extension.pri)
 include(sdk/sdk.pri)
-include($$QT_SOURCE_TREE/tools/uilib/uilib.pri)
-INCLUDEPATH += $$QT_SOURCE_TREE/tools/uilib
+include($$QT.uilib.sources/uilib.pri)
 include(shared/shared.pri)
 PRECOMPILED_HEADER=lib_pch.h
 
diff --git a/src/designer/src/lib/shared/shared.pri b/src/designer/src/lib/shared/shared.pri
index 9cba7d7bf..63ba68794 100644
--- a/src/designer/src/lib/shared/shared.pri
+++ b/src/designer/src/lib/shared/shared.pri
@@ -1,10 +1,13 @@
 
 INCLUDEPATH += $$PWD
+# -- widgets.table from uilib.
+INCLUDEPATH *= $$QT.uilib.sources
 contains(QT_CONFIG, script): QT += script
 
 include(../../../../shared/qtpropertybrowser/qtpropertybrowserutils.pri)
 include(../../../../shared/deviceskin/deviceskin.pri)
-include($$QT_SOURCE_TREE/src/tools/rcc/rcc.pri)
+
+include($$QT.core.sources/../tools/rcc/rcc.pri)
 include(../../../../shared/findwidget/findwidget.pri)
 include(../../../../shared/qtgradienteditor/qtgradienteditor.pri)
 
diff --git a/src/designer/src/lib/shared/widgetdatabase.cpp b/src/designer/src/lib/shared/widgetdatabase.cpp
index ea3e69902..9599ea04a 100644
--- a/src/designer/src/lib/shared/widgetdatabase.cpp
+++ b/src/designer/src/lib/shared/widgetdatabase.cpp
@@ -270,7 +270,7 @@ WidgetDataBase::WidgetDataBase(QDesignerFormEditorInterface *core, QObject *pare
 #define DECLARE_COMPAT_WIDGET(W, C) DECLARE_WIDGET(W, C)
 #define DECLARE_WIDGET(W, C) append(new WidgetDataBaseItem(QString::fromUtf8(#W)));
 
-#include "../../../../../../qtbase/tools/uilib/widgets.table"
+#include <widgets.table>
 
 #undef DECLARE_COMPAT_WIDGET
 #undef DECLARE_LAYOUT
diff --git a/src/designer/src/lib/shared/widgetfactory.cpp b/src/designer/src/lib/shared/widgetfactory.cpp
index b49934329..f9e590f0b 100644
--- a/src/designer/src/lib/shared/widgetfactory.cpp
+++ b/src/designer/src/lib/shared/widgetfactory.cpp
@@ -384,7 +384,7 @@ QWidget *WidgetFactory::createWidget(const QString &widgetName, QWidget *parentW
 #define DECLARE_WIDGET(W, C) else if (!qstrcmp(widgetNameC, #W)) { Q_ASSERT(w == 0); w = new W(parentWidget); }
 #define DECLARE_WIDGET_1(W, C) else if (!qstrcmp(widgetNameC, #W)) { Q_ASSERT(w == 0); w = new W(0, parentWidget); }
 
-#include "../../../../../../qtbase/tools/uilib/widgets.table"
+#include <widgets.table>
 
 #undef DECLARE_COMPAT_WIDGET
 #undef DECLARE_LAYOUT