4 files changed, 37 insertions, 7 deletions
diff --git a/src/modules/qt_uilib.pri b/src/modules/qt_uilib.pri
new file mode 100644
index 0000000000..0e143de6c9
--- /dev/null
+++ b/src/modules/qt_uilib.pri
@@ -0,0 +1,12 @@
+QT_UILIB_VERSION = $$QT_VERSION
+QT_UILIB_MAJOR_VERSION = $$QT_MAJOR_VERSION
+QT_UILIB_MINOR_VERSION = $$QT_MINOR_VERSION
+QT_UILIB_PATCH_VERSION = $$QT_PATCH_VERSION
+
+QT.uilib.name =
+QT.uilib.bins = $$QT_MODULE_BIN_BASE
+QT.uilib.includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner
+QT.uilib.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner/private
+QT.uilib.sources = $$QT_MODULE_BASE/tools/uilib
+QT.uilib.libs = $$QT_MODULE_LIB_BASE
+QT.uilib.depends = xml
diff --git a/src/modules/qt_uitools.pri b/src/modules/qt_uitools.pri
new file mode 100644
index 0000000000..1f4070c22d
--- /dev/null
+++ b/src/modules/qt_uitools.pri
@@ -0,0 +1,15 @@
+QT_UITOOLS_VERSION = $$QT_VERSION
+QT_UITOOLS_MAJOR_VERSION = $$QT_MAJOR_VERSION
+QT_UITOOLS_MINOR_VERSION = $$QT_MINOR_VERSION
+QT_UITOOLS_PATCH_VERSION = $$QT_PATCH_VERSION
+
+QT.uitools.name = QtUiTools
+QT.uitools.bins = $$QT_MODULE_BIN_BASE
+QT.uitools.includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools
+QT.uitools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools/private
+QT.uitools.sources = $$QT_MODULE_BASE/src/uitools
+QT.uitools.libs = $$QT_MODULE_LIB_BASE
+QT.uitools.depends = xml
+QT.uitools.DEFINES = QT_UITOOLS_LIB
+
+QT_CONFIG += uitools
diff --git a/src/src.pro b/src/src.pro
index 7c51c25609..491973c635 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -4,7 +4,7 @@ TEMPLATE = subdirs
 unset(SRC_SUBDIRS)
 win32:SRC_SUBDIRS += src_winmain
 symbian:SRC_SUBDIRS += src_s60main
-SRC_SUBDIRS += src_corelib src_network src_sql src_testlib src_xml
+SRC_SUBDIRS += src_corelib src_network src_sql src_testlib src_xml src_uitools
 nacl: SRC_SUBDIRS -= src_network src_testlib
 !symbian:contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus
 !contains(QT_CONFIG, no-gui): SRC_SUBDIRS += src_gui
@@ -29,6 +29,8 @@ src_corelib.subdir = $$QT_SOURCE_TREE/src/corelib
 src_corelib.target = sub-corelib
 src_xml.subdir = $$QT_SOURCE_TREE/src/xml
 src_xml.target = sub-xml
+src_uitools.subdir = $$QT_SOURCE_TREE/src/uitools
+src_uitools.target = sub-uitools
 src_dbus.subdir = $$QT_SOURCE_TREE/src/dbus
 src_dbus.target = sub-dbus
 src_gui.subdir = $$QT_SOURCE_TREE/src/gui
@@ -52,6 +54,7 @@ src_testlib.target = sub-testlib
    src_gui.depends = src_corelib src_tools_uic
    embedded: src_gui.depends += src_network
    src_xml.depends = src_corelib
+   src_uitools.depends = src_corelib src_xml
    src_dbus.depends = src_corelib src_xml
    src_network.depends = src_corelib
    src_opengl.depends = src_gui
diff --git a/src/uitools/uitools.pro b/src/uitools/uitools.pro
index be46afcfcf..07114a4725 100644
--- a/src/uitools/uitools.pro
+++ b/src/uitools/uitools.pro
@@ -1,9 +1,9 @@
+MODULE     = uitools
+QPRO_PWD   = $$PWD
 TEMPLATE = lib
-TARGET = QtUiTools
-QT += xml
+TARGET = $$qtLibraryTarget(QtUiTools)
+QT = core xml
 CONFIG += qt staticlib
-DESTDIR = ../../../../lib
-DLLDESTDIR = ../../../../bin
 
 symbian {
     TARGET.UID3 = 0x2001E628
@@ -18,11 +18,11 @@ isEmpty(QT_MAJOR_VERSION) {
 } else {
    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 }
-include(../../../../src/qt_targets.pri)
+include(../qt_targets.pri)
 QMAKE_TARGET_PRODUCT = UiLoader
 QMAKE_TARGET_DESCRIPTION = QUiLoader
 
-include(../lib/uilib/uilib.pri)
+include(../../tools/uilib/uilib.pri)
 
 HEADERS += quiloader.h
 SOURCES += quiloader.cpp