fix logical mismerge from 5.6
iphonesimulator_and_iphoneos was renamed to simulator_and_device in 5.7. Task-number: QTBUG-54163 Change-Id: If4a76f45450edc0f6e8fb3615355613212314300 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
This commit is contained in:
parent
3d8c8daae1
commit
ccf461acf0
@ -15,7 +15,7 @@ TEMPLATE = lib
|
||||
CONFIG += plugin
|
||||
|
||||
if(win32|mac):!macx-xcode {
|
||||
contains(QT_CONFIG, simulator_and_device): CONFIG += iphonesimulator_and_iphoneos
|
||||
contains(QT_CONFIG, simulator_and_device): CONFIG += simulator_and_device
|
||||
contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release
|
||||
contains(QT_CONFIG, build_all): CONFIG += build_all
|
||||
}
|
||||
|
@ -18,7 +18,7 @@ QT = # In case qt is re-added.
|
||||
CONFIG -= warning_clean # Don't presume 3rd party code to be clean
|
||||
load(qt_common)
|
||||
|
||||
contains(QT_CONFIG, simulator_and_device): CONFIG += iphonesimulator_and_iphoneos
|
||||
contains(QT_CONFIG, simulator_and_device): CONFIG += simulator_and_device
|
||||
contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release
|
||||
contains(QT_CONFIG, build_all): CONFIG += build_all
|
||||
|
||||
|
@ -89,7 +89,7 @@ INCLUDEPATH *= $$eval(QT.$${MODULE}.includes) $$eval(QT.$${MODULE}_private.inclu
|
||||
# If Qt was configured with -debug-and-release then build the module the same way
|
||||
# - unless this is a host library
|
||||
!host_build:if(win32|mac):!macx-xcode {
|
||||
contains(QT_CONFIG, simulator_and_device): CONFIG += iphonesimulator_and_iphoneos
|
||||
contains(QT_CONFIG, simulator_and_device): CONFIG += simulator_and_device
|
||||
contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release
|
||||
contains(QT_CONFIG, build_all): CONFIG += build_all
|
||||
}
|
||||
|
@ -26,7 +26,7 @@ win32:CONFIG(shared, static|shared) {
|
||||
tool_plugin {
|
||||
!build_pass:contains(QT_CONFIG, debug_and_release): CONFIG += release
|
||||
} else:if(win32|mac):!macx-xcode {
|
||||
contains(QT_CONFIG, simulator_and_device): CONFIG += iphonesimulator_and_iphoneos
|
||||
contains(QT_CONFIG, simulator_and_device): CONFIG += simulator_and_device
|
||||
contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release
|
||||
contains(QT_CONFIG, build_all): CONFIG += build_all
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user