diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-12 14:03:21 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-12 14:03:21 +0200 |
| commit | 1866c13b7dd48aa0c6ede1cf7907a2640e9399f8 (patch) | |
| tree | 0b61c2d801525228f4c5795795d1cdeb57b3edfa /mkspecs/common | |
| parent | 5b648d4d79d07a7c851ce6211ffff8375d41bfa2 (diff) | |
| parent | 3ef6cf060e984bca43956a23b61b32ec7347cfc7 (diff) | |
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/clang.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/g++-macx.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/gcc-base-mac.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/llvm.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/mac.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/macx.conf | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf index c94ee40934..ace2496f10 100644 --- a/mkspecs/common/clang.conf +++ b/mkspecs/common/clang.conf @@ -1,5 +1,5 @@ # -# Qmake configuration for Clang on Linux and Mac +# Qmake configuration for Clang on Linux, OS X and iOS # QMAKE_COMPILER = gcc clang llvm # clang pretends to be gcc diff --git a/mkspecs/common/g++-macx.conf b/mkspecs/common/g++-macx.conf index bae8eb0965..086510dd96 100644 --- a/mkspecs/common/g++-macx.conf +++ b/mkspecs/common/g++-macx.conf @@ -1,5 +1,5 @@ # -# Qmake configuration for the GNU C++ compiler on Mac OS X +# Qmake configuration for the GNU C++ compiler on OS X # # Before making changes to this file, please read the comment in # gcc-base.conf, to make sure the change goes in the right place. diff --git a/mkspecs/common/gcc-base-mac.conf b/mkspecs/common/gcc-base-mac.conf index fa2b5765bf..e0469f31cc 100644 --- a/mkspecs/common/gcc-base-mac.conf +++ b/mkspecs/common/gcc-base-mac.conf @@ -1,5 +1,5 @@ # -# Base qmake configuration for GCC on Mac OS X and iOS +# Base qmake configuration for GCC on OS X and iOS # # Before making changes to this file, please read the comment in # gcc-base.conf, to make sure the change goes in the right place. diff --git a/mkspecs/common/llvm.conf b/mkspecs/common/llvm.conf index 8f6946f9a2..c906dce6fc 100644 --- a/mkspecs/common/llvm.conf +++ b/mkspecs/common/llvm.conf @@ -1,5 +1,5 @@ # -# Qmake configuration for LLVM on Linux and Mac +# Qmake configuration for LLVM on Linux, OS X and iOS # QMAKE_COMPILER = gcc llvm diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf index cb751723f3..4421665370 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -1,5 +1,5 @@ # -# qmake configuration for common Mac OS (OSX and iOS) +# qmake configuration common to OS X and iOS # !load(device_config): error(Could not successfully load device configuration) diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf index 33e7c6911a..ad54612f22 100644 --- a/mkspecs/common/macx.conf +++ b/mkspecs/common/macx.conf @@ -1,5 +1,5 @@ # -# qmake configuration for common Mac OS X +# qmake configuration for common OS X # QMAKE_PLATFORM += osx macx |