diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2013-06-03 05:04:12 -0400 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-06-03 12:36:13 +0200 |
| commit | 8018ff996a0ab8fa9f25e017441e2776ae667ffb (patch) | |
| tree | 5cd671b6c7ef84f80956c0ed75d636d8a514745b /tests/manual/minimumSystemVersion | |
| parent | acf8e4f4fcf14d6edf6fbb79ae2cfae1ce475baa (diff) | |
Be less ambiguous about the naming and referencing of OS X.
Change-Id: I7a389cb744c451cee435196fd65a8987199d3ed5
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests/manual/minimumSystemVersion')
| -rw-r--r-- | tests/manual/minimumSystemVersion/main.cpp | 2 | ||||
| -rw-r--r-- | tests/manual/minimumSystemVersion/minimumSystemVersion.qbs | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/manual/minimumSystemVersion/main.cpp b/tests/manual/minimumSystemVersion/main.cpp index 769428574..87dc09203 100644 --- a/tests/manual/minimumSystemVersion/main.cpp +++ b/tests/manual/minimumSystemVersion/main.cpp @@ -36,7 +36,7 @@ int main(int argc, char *argv[]) dumpbin.waitForFinished(); #endif -#ifdef Q_OS_MAC +#ifdef Q_OS_MACX out.setIntegerBase(10); // This gets set by -mmacosx-version-min. If left undefined, defaults to the current OS version. diff --git a/tests/manual/minimumSystemVersion/minimumSystemVersion.qbs b/tests/manual/minimumSystemVersion/minimumSystemVersion.qbs index 24313ef5b..1f3430b0b 100644 --- a/tests/manual/minimumSystemVersion/minimumSystemVersion.qbs +++ b/tests/manual/minimumSystemVersion/minimumSystemVersion.qbs @@ -22,7 +22,7 @@ Project { name: "unspecified-forced" files: "main.cpp" cpp.minimumWindowsVersion: undefined - cpp.minimumMacVersion: undefined + cpp.minimumOsxVersion: undefined cpp.minimumIosVersion: undefined cpp.minimumAndroidVersion: undefined @@ -38,7 +38,7 @@ Project { CppApplication { type: "application" Depends { name: "Qt.core" } - condition: qbs.targetOS === "windows" || qbs.targetOS === "mac" + condition: qbs.targetOS === "windows" || qbs.targetOS === "osx" name: "specific" files: "main.cpp" @@ -48,9 +48,9 @@ Project { } Properties { - condition: qbs.targetOS === "mac" + condition: qbs.targetOS === "osx" cpp.frameworks: "Foundation" - cpp.minimumMacVersion: "10.6" + cpp.minimumOsxVersion: "10.6" } } @@ -72,7 +72,7 @@ Project { CppApplication { type: "application" Depends { name: "Qt.core" } - condition: qbs.targetOS === "mac" + condition: qbs.targetOS === "osx" name: "macappstore" files: "main.cpp" cpp.frameworks: "Foundation" |