1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix logical mismerge from 5.6

Browse Source 
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:
Oswald Buddenhagen 2016-06-17 11:22:27 +02:00 committed by Liang Qi
parent 3d8c8daae1
commit ccf461acf0
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/features/qml_plugin.prf
View File

@ -15,7 +15,7 @@ TEMPLATE = lib
CONFIG += plugin CONFIG += plugin
if(win32|mac):!macx-xcode { 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, debug_and_release): CONFIG += debug_and_release
contains(QT_CONFIG, build_all): CONFIG += build_all contains(QT_CONFIG, build_all): CONFIG += build_all
} }

2
mkspecs/features/qt_helper_lib.prf
View File

@ -18,7 +18,7 @@ QT = # In case qt is re-added.
CONFIG -= warning_clean # Don't presume 3rd party code to be clean CONFIG -= warning_clean # Don't presume 3rd party code to be clean
load(qt_common) 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, debug_and_release): CONFIG += debug_and_release
contains(QT_CONFIG, build_all): CONFIG += build_all contains(QT_CONFIG, build_all): CONFIG += build_all

2
mkspecs/features/qt_module.prf
View File

@ -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 # If Qt was configured with -debug-and-release then build the module the same way
# - unless this is a host library # - unless this is a host library
!host_build:if(win32|mac):!macx-xcode { !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, debug_and_release): CONFIG += debug_and_release
contains(QT_CONFIG, build_all): CONFIG += build_all contains(QT_CONFIG, build_all): CONFIG += build_all
} }

2
mkspecs/features/qt_plugin.prf
View File

@ -26,7 +26,7 @@ win32:CONFIG(shared, static|shared) {
tool_plugin { tool_plugin {
!build_pass:contains(QT_CONFIG, debug_and_release): CONFIG += release !build_pass:contains(QT_CONFIG, debug_and_release): CONFIG += release
} else:if(win32|mac):!macx-xcode { } 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, debug_and_release): CONFIG += debug_and_release
contains(QT_CONFIG, build_all): CONFIG += build_all contains(QT_CONFIG, build_all): CONFIG += build_all
} }