Designer: Compile on Windows.

Clean up .pro-files, remove fiddling with libraryTarget.

Change-Id: I81e1b7cf6e2bbafec3a36e56f92e44a83886bb31
Reviewed-on: http://codereview.qt-project.org/5978
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/src/designer/src/components/component.pri b/src/designer/src/components/component.pri
deleted file mode 100644 (file)
index a5b02c3..0000000
--- a/src/designer/src/components/component.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-load(qt_module)
-TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end

diff --git a/src/designer/src/components/lib/lib.pro b/src/designer/src/components/lib/lib.pro
index 4c25511..93dcf9a 100644 (file)
--- a/src/designer/src/components/lib/lib.pro
+++ b/src/designer/src/components/lib/lib.pro
@@ -51,7 +51,6 @@ include(../tabordereditor/tabordereditor.pri)
 PRECOMPILED_HEADER= lib_pch.h
 
 include(../../sharedcomponents.pri)
-include(../component.pri)
 
 unix|win32-g++* {
     QMAKE_PKGCONFIG_REQUIRES = QtCore QtDesigner QtGui QtXml

diff --git a/src/designer/src/designer/designer.pro b/src/designer/src/designer/designer.pro
index 1f450d6..353fca8 100644 (file)
--- 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 printsupport
+QT += core-private widgets xml network designer-private printsupport
 
 CONFIG += module
 MODULE_PRI = ../../../../modules/qt_designer.pri

diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro
index ffb9eb2..5006420 100644 (file)
--- a/src/designer/src/lib/lib.pro
+++ b/src/designer/src/lib/lib.pro
@@ -1,7 +1,6 @@
 MODULE = designer
 
 load(qt_module)
-load(qt_module_config)
 
 TARGET = QtDesigner
 QPRO_PWD = $$PWD
@@ -47,4 +46,3 @@ include(uilib/uilib.pri)
 PRECOMPILED_HEADER=lib_pch.h
 
 include(../sharedcomponents.pri)
-include(../components/component.pri)