don't put QMAKESPEC_ORIGINAL into INCLUDEPATH any more
the spec does that itself, given that the real spec is just included nowadays, instead of copied (which never worked without side effects). Change-Id: Ibf655b9a943dadb949d3c7a58d8fe50fcd62cef7 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
parent
4b637bf1f0
commit
dafc4a884c
@ -11,11 +11,6 @@ win32 {
|
||||
}
|
||||
contains(DEFINES, QT_MAKEDLL)|contains(DEFINES, QT_DLL):QMAKE_QT_DLL = 1
|
||||
}
|
||||
# Some files include qplatformdefs.h, which lives in the individual mkspec directory
|
||||
# However, if QMAKESPEC_ORIGINAL is set, the module/app is outside of the QtBase
|
||||
# directory, and using the default profile. So we add the original mkspecs directory
|
||||
# to the include path
|
||||
!isEmpty(QMAKESPEC_ORIGINAL):INCLUDEPATH += $$QMAKESPEC_ORIGINAL
|
||||
}
|
||||
CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG
|
||||
contains(QT_CONFIG, force_asserts):DEFINES += QT_FORCE_ASSERTS
|
||||
|
Loading…
Reference in New Issue
Block a user