1 files changed, 17 insertions, 47 deletions
diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro
index a23e16417..7219ad57f 100644
--- a/src/designer/src/lib/lib.pro
+++ b/src/designer/src/lib/lib.pro
@@ -1,47 +1,30 @@
+MODULE = designer
 load(qt_module)
 
 TARGET = QtDesigner
-QT += core-private gui-private widgets widgets-private xml uilib uilib-private
+QPRO_PWD = $$PWD
+QT += core-private gui-private widgets widgets-private xml
 
-contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
+CONFIG += module
+MODULE_PRI = ../../../../modules/qt_designer.pri
 
-#win32|mac: CONFIG += debug_and_release
-#DESTDIR = $$QT_BUILD_TREE/lib
-#!wince*:DLLDESTDIR = $$QT.designer.bins
-
-#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}
-#}
-
-unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtXml
+unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtXml QtCore QtGui QtWidgets
 
 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
-}
+#!contains(CONFIG, static) {
+#    CONFIG += dll
 
-##headers.pri is loaded from the last include path
-#LAST_MODULE_INCLUDE=$$INCLUDEPATH
-#for(include_path, INCLUDEPATH):LAST_MODULE_INCLUDE=$${include_path}
-#HEADERS_PRI = $$LAST_MODULE_INCLUDE/headers.pri
-#include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI)
+#    DEFINES += \
+#        QDESIGNER_SDK_LIBRARY \
+#        QDESIGNER_EXTENSION_LIBRARY \
+#        QDESIGNER_UILIB_LIBRARY \
+#        QDESIGNER_SHARED_LIBRARY
+#} else {
+#    DEFINES += QT_DESIGNER_STATIC
+#}
 
 #mac frameworks
 mac:CONFIG += explicitlib
@@ -64,21 +47,8 @@ mac:!static:contains(QT_CONFIG, qt_framework) {
 include(extension/extension.pri)
 include(sdk/sdk.pri)
 include(shared/shared.pri)
+include(uilib/uilib.pri)
 PRECOMPILED_HEADER=lib_pch.h
 
 include(../sharedcomponents.pri)
 include(../components/component.pri)
-
-#target.path=$$[QT_INSTALL_LIBS]
-#INSTALLS        += target
-#win32 {
-#    dlltarget.path=$$[QT_INSTALL_BINS]
-#    INSTALLS += dlltarget
-#}
-
-
-#qt_install_headers {
-#    designer_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
-#    designer_headers.path = $$[QT_INSTALL_HEADERS]/QtDesigner
-#    INSTALLS        += designer_headers
-#}