From cf10131d441eee9203ae11f557e20d1bf255b50e Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Tue, 9 Jul 2013 10:07:07 -0400 Subject: Refer to Apple products by their actual names. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a comment-only change. Change-Id: I2432b1135ef21d781c9486df06699710f2696ee3 Reviewed-by: Tor Arne Vestbø --- mkspecs/common/clang.conf | 2 +- mkspecs/common/g++-macx.conf | 2 +- mkspecs/common/gcc-base-mac.conf | 2 +- mkspecs/common/llvm.conf | 2 +- mkspecs/common/mac.conf | 2 +- mkspecs/common/macx.conf | 2 +- mkspecs/features/qt_module.prf | 2 +- mkspecs/macx-g++-32/qmake.conf | 2 +- mkspecs/macx-g++/qmake.conf | 2 +- mkspecs/macx-g++40/qmake.conf | 2 +- mkspecs/macx-g++42/qmake.conf | 2 +- mkspecs/macx-icc/qmake.conf | 2 +- mkspecs/macx-llvm/qmake.conf | 2 +- mkspecs/macx-xcode/qmake.conf | 2 +- 14 files changed, 14 insertions(+), 14 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 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 53a5499545..7f7de85bb6 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -87,7 +87,7 @@ contains(TARGET, QtAddOn.*): \ else: \ DEFINES += QT_BUILD_$${ucmodule}_LIB -#mac frameworks +# OS X and iOS frameworks mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) { #QMAKE_FRAMEWORK_VERSION = 4.0 CONFIG += lib_bundle qt_framework diff --git a/mkspecs/macx-g++-32/qmake.conf b/mkspecs/macx-g++-32/qmake.conf index bf8f68c680..6ef78aacbf 100644 --- a/mkspecs/macx-g++-32/qmake.conf +++ b/mkspecs/macx-g++-32/qmake.conf @@ -3,7 +3,7 @@ # # qmake configuration for macx-g++ # -# Mac OS X + command-line compiler +# OS X + command-line compiler # MAKEFILE_GENERATOR = UNIX diff --git a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf index 96d9f6e487..a6c075a2ce 100644 --- a/mkspecs/macx-g++/qmake.conf +++ b/mkspecs/macx-g++/qmake.conf @@ -3,7 +3,7 @@ # # qmake configuration for macx-g++ # -# Mac OS X + command-line compiler +# OS X + command-line compiler # MAKEFILE_GENERATOR = UNIX diff --git a/mkspecs/macx-g++40/qmake.conf b/mkspecs/macx-g++40/qmake.conf index fe7683e02d..f40315a602 100644 --- a/mkspecs/macx-g++40/qmake.conf +++ b/mkspecs/macx-g++40/qmake.conf @@ -3,7 +3,7 @@ # # qmake configuration for macx-g++ # -# Mac OS X + command-line compiler +# OS X + command-line compiler # MAKEFILE_GENERATOR = UNIX diff --git a/mkspecs/macx-g++42/qmake.conf b/mkspecs/macx-g++42/qmake.conf index 9041d8ba05..25383e9cb6 100644 --- a/mkspecs/macx-g++42/qmake.conf +++ b/mkspecs/macx-g++42/qmake.conf @@ -3,7 +3,7 @@ # # qmake configuration for macx-g++ # -# Mac OS X + command-line compiler +# OS X + command-line compiler # MAKEFILE_GENERATOR = UNIX diff --git a/mkspecs/macx-icc/qmake.conf b/mkspecs/macx-icc/qmake.conf index 2522d5c382..69f0b4cc0c 100644 --- a/mkspecs/macx-icc/qmake.conf +++ b/mkspecs/macx-icc/qmake.conf @@ -1,7 +1,7 @@ # # qmake configuration for macx-icc # -# Written for Intel C++ Compiler versions 8.x and 9.x for Mac OS X +# Written for Intel C++ Compiler versions 8.x and 9.x for OS X # # Note: Some of the remarks from the Intel compiler are disabled (even # with 'warn_on' specified): diff --git a/mkspecs/macx-llvm/qmake.conf b/mkspecs/macx-llvm/qmake.conf index 7e6ee1c9de..7bdef70943 100644 --- a/mkspecs/macx-llvm/qmake.conf +++ b/mkspecs/macx-llvm/qmake.conf @@ -3,7 +3,7 @@ # # qmake configuration for macx-g++ # -# Mac OS X + command-line compiler +# OS X + command-line compiler # MAKEFILE_GENERATOR = UNIX diff --git a/mkspecs/macx-xcode/qmake.conf b/mkspecs/macx-xcode/qmake.conf index 7f65d263a3..bfc1c58935 100644 --- a/mkspecs/macx-xcode/qmake.conf +++ b/mkspecs/macx-xcode/qmake.conf @@ -1,7 +1,7 @@ # # qmake configuration for macx-xcode # -# Mac OS X + XCode +# OS X + Xcode # include(../$$[QMAKE_XSPEC]/qmake.conf) -- cgit v1.2.3