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>
This commit is contained in:
parent
c595988a58
commit
88a07df5e5
@ -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
|
||||
|
@ -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
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user