diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-12 20:33:20 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:46:00 +0200 |
| commit | 88a07df5e5e399f9d60ee9a3bfac86c577ab7d95 (patch) | |
| tree | 350cc17622af3345476bb2ebd484eab334ba07e8 | |
| parent | c595988a5841deaf04aaac61b5354c120b9e4b0f (diff) | |
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>
| -rw-r--r-- | mkspecs/features/qt_installs.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/qt_module_config.prf | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf index fc4bdb6736..100ad59c66 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 2be7fbaf1b..28d70c1f73 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 } |