From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 12 Apr 2012 18:33:20 +0000 (+0200)
Subject: remove workarounds for broken syncqt
X-Git-Tag: 071012110112~338^2^2~36
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=88a07df5e5e399f9d60ee9a3bfac86c577ab7d95;p=profile%2Fivi%2Fqtbase.git

remove workarounds for broken syncqt

SYNCQT.HEADER_FILES contains qconfig.h just fine nowadays.

Change-Id: I52b35d2ac41d772acaef06f3931df75742c867cb
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---

diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf
index fc4bdb6..100ad59 100644
--- a/mkspecs/features/qt_installs.prf
+++ b/mkspecs/features/qt_installs.prf
@@ -11,10 +11,6 @@
 #headers
 qt_install_headers {
     INSTALL_HEADERS = $$SYNCQT.HEADER_FILES
-    equals(TARGET, QtCore) {
-       #headers created by configure
-       INSTALL_HEADERS *= $$QT_BUILD_TREE/src/corelib/global/qconfig.h
-    }
 
     equals(TARGET, phonon) {
         class_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET
diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf
index 2be7fba..28d70c1 100644
--- a/mkspecs/features/qt_module_config.prf
+++ b/mkspecs/features/qt_module_config.prf
@@ -132,12 +132,6 @@ mac:!static:contains(QT_CONFIG, qt_framework) {
           FRAMEWORK_HEADERS.version = Versions
           FRAMEWORK_HEADERS.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
           FRAMEWORK_HEADERS.path = Headers
-          equals(TARGET, QtCore) {
-              #headers generated by configure
-              !contains(FRAMEWORK_HEADERS.files, .*/qconfig.h) {
-                  FRAMEWORK_HEADERS.files *= $$QT_BUILD_TREE/src/corelib/global/qconfig.h
-              }
-          }
       }
       QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
    }