diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-03-16 13:36:47 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-03-16 17:57:56 +0100 |
| commit | 77885f8402ad65e00e01c5e15777edcedf9741b2 (patch) | |
| tree | 456874ac9ce27cfb1d4c6100056893620b308529 /util/cmake/tests/test_scope_handling.py | |
| parent | db745fdd2dbd57af54f7da637eef6c892824a6fb (diff) | |
cmake: Remove APPLE prefix from platform names
None of the other platforms have it.
Change-Id: Ib448c2c03ba03f711b507ef391977c0e6aa7c192
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'util/cmake/tests/test_scope_handling.py')
| -rwxr-xr-x | util/cmake/tests/test_scope_handling.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/util/cmake/tests/test_scope_handling.py b/util/cmake/tests/test_scope_handling.py index ecb0ae06cf0..51e569fb097 100755 --- a/util/cmake/tests/test_scope_handling.py +++ b/util/cmake/tests/test_scope_handling.py @@ -305,7 +305,7 @@ def test_qstandardpaths_scopes(): scope6 = _new_scope(parent_scope=scope5, condition='UNIX') # mac { # OBJECTIVE_SOURCES += io/qstandardpaths_mac.mm - scope7 = _new_scope(parent_scope=scope6, condition='APPLE_MACOS', SOURCES='qsp_mac.mm') + scope7 = _new_scope(parent_scope=scope6, condition='MACOS', SOURCES='qsp_mac.mm') # } else:android:!android-embedded { # SOURCES += io/qstandardpaths_android.cpp scope8 = _new_scope(parent_scope=scope6, condition='else') @@ -330,12 +330,12 @@ def test_qstandardpaths_scopes(): assert scope4.total_condition == 'WINRT' assert scope5.total_condition == 'UNIX' assert scope6.total_condition == 'UNIX' - assert scope7.total_condition == 'APPLE_MACOS' - assert scope8.total_condition == 'UNIX AND NOT APPLE_MACOS' + assert scope7.total_condition == 'MACOS' + assert scope8.total_condition == 'UNIX AND NOT MACOS' assert scope9.total_condition == 'ANDROID AND NOT ANDROID_EMBEDDED' - assert scope10.total_condition == 'UNIX AND NOT APPLE_MACOS AND (ANDROID_EMBEDDED OR NOT ANDROID)' + assert scope10.total_condition == 'UNIX AND NOT MACOS AND (ANDROID_EMBEDDED OR NOT ANDROID)' assert scope11.total_condition == 'HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)' - assert scope12.total_condition == 'UNIX AND NOT APPLE_MACOS AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)' + assert scope12.total_condition == 'UNIX AND NOT MACOS AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)' def test_recursive_expansion(): scope = _new_scope(A='Foo',B='$$A/Bar') |