summaryrefslogtreecommitdiffstats
path: root/mkspecs/common
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@petroules.com>2013-07-09 10:07:07 -0400
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-10 17:32:48 +0200
commitcf10131d441eee9203ae11f557e20d1bf255b50e (patch)
treea190ea31577a28c23844877b643aa59172bb8c99 /mkspecs/common
parenta096b4680dca367ec26725d064eba1df6c37d6b7 (diff)
Refer to Apple products by their actual names.
This is a comment-only change. Change-Id: I2432b1135ef21d781c9486df06699710f2696ee3 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'mkspecs/common')
-rw-r--r--mkspecs/common/clang.conf2
-rw-r--r--mkspecs/common/g++-macx.conf2
-rw-r--r--mkspecs/common/gcc-base-mac.conf2
-rw-r--r--mkspecs/common/llvm.conf2
-rw-r--r--mkspecs/common/mac.conf2
-rw-r--r--mkspecs/common/macx.conf2
6 files changed, 6 insertions, 6 deletions
diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf
index 3ce04b679e..4f141351c1 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 341c74657a..1b480aa267 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 7f9f54ec12..48efae5d1e 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 += macx