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>
This commit is contained in:
parent
a096b4680d
commit
cf10131d44
@ -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
|
||||
|
@ -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.
|
||||
|
@ -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.
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# qmake configuration for common Mac OS X
|
||||
# qmake configuration for common OS X
|
||||
#
|
||||
|
||||
QMAKE_PLATFORM += macx
|
||||
|
@ -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
|
||||
|
@ -3,7 +3,7 @@
|
||||
#
|
||||
# qmake configuration for macx-g++
|
||||
#
|
||||
# Mac OS X + command-line compiler
|
||||
# OS X + command-line compiler
|
||||
#
|
||||
|
||||
MAKEFILE_GENERATOR = UNIX
|
||||
|
@ -3,7 +3,7 @@
|
||||
#
|
||||
# qmake configuration for macx-g++
|
||||
#
|
||||
# Mac OS X + command-line compiler
|
||||
# OS X + command-line compiler
|
||||
#
|
||||
|
||||
MAKEFILE_GENERATOR = UNIX
|
||||
|
@ -3,7 +3,7 @@
|
||||
#
|
||||
# qmake configuration for macx-g++
|
||||
#
|
||||
# Mac OS X + command-line compiler
|
||||
# OS X + command-line compiler
|
||||
#
|
||||
|
||||
MAKEFILE_GENERATOR = UNIX
|
||||
|
@ -3,7 +3,7 @@
|
||||
#
|
||||
# qmake configuration for macx-g++
|
||||
#
|
||||
# Mac OS X + command-line compiler
|
||||
# OS X + command-line compiler
|
||||
#
|
||||
|
||||
MAKEFILE_GENERATOR = UNIX
|
||||
|
@ -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):
|
||||
|
@ -3,7 +3,7 @@
|
||||
#
|
||||
# qmake configuration for macx-g++
|
||||
#
|
||||
# Mac OS X + command-line compiler
|
||||
# OS X + command-line compiler
|
||||
#
|
||||
|
||||
MAKEFILE_GENERATOR = UNIX
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# qmake configuration for macx-xcode
|
||||
#
|
||||
# Mac OS X + XCode
|
||||
# OS X + Xcode
|
||||
#
|
||||
|
||||
include(../$$[QMAKE_XSPEC]/qmake.conf)
|
||||
|
Loading…
Reference in New Issue
Block a user