remove some unnecessary (and even wrong) project setup code

the centralized code handles it just fine

Task-number: QTBUG-28633
Change-Id: I46105ab301869dec807fdc4ca5fe5e563bc217b9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

diff --git a/src/designer/src/components/lib/lib.pro b/src/designer/src/components/lib/lib.pro
index 6910451..72110df 100644 (file)
--- a/src/designer/src/components/lib/lib.pro
+++ b/src/designer/src/components/lib/lib.pro
@@ -12,21 +12,10 @@ DEFINES += QDESIGNER_COMPONENTS_LIBRARY
 
 static:DEFINES += QT_DESIGNER_STATIC
 
-load(qt_targets)
+# Override qt_targets
 QMAKE_TARGET_PRODUCT = Designer
 QMAKE_TARGET_DESCRIPTION = Graphical user interface designer.
 
-#load up the headers info
-HEADERS_PRI = $$QT.designer.includes/headers.pri
-include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI)
-
-#mac frameworks
-mac:!static:contains(QT_CONFIG, qt_framework) {
-   QMAKE_FRAMEWORK_BUNDLE_NAME = $$TARGET
-   CONFIG += lib_bundle qt_no_framework_direct_includes qt_framework
-   CONFIG(debug, debug|release):!build_pass:CONFIG += build_all
-}
-
 SOURCES += qdesigner_components.cpp
 
 INCLUDEPATH += . .. \
@@ -48,10 +37,6 @@ PRECOMPILED_HEADER= lib_pch.h
 
 include(../../sharedcomponents.pri)
 
-unix|win32-g++* {
-    QMAKE_PKGCONFIG_REQUIRES = QtCore QtDesigner QtGui QtXml
-}
-
 # MinGW GCC cc1plus crashes when using precompiled header
 # Date Checked: 3rd September 2012
 #

diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro
index a2be6b9..b93bd5d 100644 (file)
--- a/src/designer/src/lib/lib.pro
+++ b/src/designer/src/lib/lib.pro
@@ -14,24 +14,6 @@ DEFINES += \
 
 static:DEFINES += QT_DESIGNER_STATIC
 
-#mac frameworks
-mac:CONFIG += explicitlib
-mac:!static:contains(QT_CONFIG, qt_framework) {
-   QMAKE_FRAMEWORK_BUNDLE_NAME = $$TARGET
-   CONFIG += lib_bundle qt_no_framework_direct_includes qt_framework
-   CONFIG(debug, debug|release) {
-      !build_pass:CONFIG += build_all
-   } else { #release
-      !debug_and_release|build_pass {
-         CONFIG -= qt_install_headers #no need to install these as well
-         FRAMEWORK_HEADERS.version = Versions
-         FRAMEWORK_HEADERS.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
-         FRAMEWORK_HEADERS.path = Headers
-      }
-      QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
-   }
-}
-
 include(extension/extension.pri)
 include(sdk/sdk.pri)
 include(shared/shared.pri)

diff --git a/src/designer/src/sharedcomponents.pri b/src/designer/src/sharedcomponents.pri
index 98c5966..8945138 100644 (file)
--- a/src/designer/src/sharedcomponents.pri
+++ b/src/designer/src/sharedcomponents.pri
@@ -20,11 +20,3 @@ for(QTSHAREDLIB, $$list($$unique(LIBS))) {
         qtAddLibrary($$QT_SHARED_LIB_NAME)
     }
 }
-
-unix {
-   CONFIG     += create_pc
-   QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS]
-   QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET
-   QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS]
-   QMAKE_PKGCONFIG_DESTDIR = pkgconfig
-}