1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refer to Apple products by their actual names.

Browse Source 
This is a comment-only change.

Change-Id: I2432b1135ef21d781c9486df06699710f2696ee3
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
This commit is contained in:
Jake Petroules 2013-07-09 10:07:07 -04:00 committed by The Qt Project
parent a096b4680d
commit cf10131d44
14 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/common/clang.conf
View File

@ -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 QMAKE_COMPILER = gcc clang llvm # clang pretends to be gcc

2
mkspecs/common/g++-macx.conf
View File

@ -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 # Before making changes to this file, please read the comment in
# gcc-base.conf, to make sure the change goes in the right place. # gcc-base.conf, to make sure the change goes in the right place.

2
mkspecs/common/gcc-base-mac.conf
View File

@ -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 # Before making changes to this file, please read the comment in
# gcc-base.conf, to make sure the change goes in the right place. # gcc-base.conf, to make sure the change goes in the right place.

2
mkspecs/common/llvm.conf
View File

@ -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 QMAKE_COMPILER = gcc llvm

2
mkspecs/common/mac.conf
View File

@ -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) !load(device_config): error(Could not successfully load device configuration)

2
mkspecs/common/macx.conf
View File

@ -1,5 +1,5 @@
# #
# qmake configuration for common Mac OS X # qmake configuration for common OS X
# #
QMAKE_PLATFORM += macx QMAKE_PLATFORM += macx

2
mkspecs/features/qt_module.prf
View File

@ -87,7 +87,7 @@ contains(TARGET, QtAddOn.*): \
else: \ else: \
DEFINES += QT_BUILD_$${ucmodule}_LIB DEFINES += QT_BUILD_$${ucmodule}_LIB
#mac frameworks # OS X and iOS frameworks
mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) { mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) {
#QMAKE_FRAMEWORK_VERSION = 4.0 #QMAKE_FRAMEWORK_VERSION = 4.0
CONFIG += lib_bundle qt_framework CONFIG += lib_bundle qt_framework

2
mkspecs/macx-g++-32/qmake.conf
View File

@ -3,7 +3,7 @@
# #
# qmake configuration for macx-g++ # qmake configuration for macx-g++
# #
# Mac OS X + command-line compiler # OS X + command-line compiler
# #
MAKEFILE_GENERATOR = UNIX MAKEFILE_GENERATOR = UNIX

2
mkspecs/macx-g++/qmake.conf
View File

@ -3,7 +3,7 @@
# #
# qmake configuration for macx-g++ # qmake configuration for macx-g++
# #
# Mac OS X + command-line compiler # OS X + command-line compiler
# #
MAKEFILE_GENERATOR = UNIX MAKEFILE_GENERATOR = UNIX

2
mkspecs/macx-g++40/qmake.conf
View File

@ -3,7 +3,7 @@
# #
# qmake configuration for macx-g++ # qmake configuration for macx-g++
# #
# Mac OS X + command-line compiler # OS X + command-line compiler
# #
MAKEFILE_GENERATOR = UNIX MAKEFILE_GENERATOR = UNIX

2
mkspecs/macx-g++42/qmake.conf
View File

@ -3,7 +3,7 @@
# #
# qmake configuration for macx-g++ # qmake configuration for macx-g++
# #
# Mac OS X + command-line compiler # OS X + command-line compiler
# #
MAKEFILE_GENERATOR = UNIX MAKEFILE_GENERATOR = UNIX

2
mkspecs/macx-icc/qmake.conf
View File

@ -1,7 +1,7 @@
# #
# qmake configuration for macx-icc # 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 # Note: Some of the remarks from the Intel compiler are disabled (even
# with 'warn_on' specified): # with 'warn_on' specified):

2
mkspecs/macx-llvm/qmake.conf
View File

@ -3,7 +3,7 @@
# #
# qmake configuration for macx-g++ # qmake configuration for macx-g++
# #
# Mac OS X + command-line compiler # OS X + command-line compiler
# #
MAKEFILE_GENERATOR = UNIX MAKEFILE_GENERATOR = UNIX

2
mkspecs/macx-xcode/qmake.conf
View File

@ -1,7 +1,7 @@
# #
# qmake configuration for macx-xcode # qmake configuration for macx-xcode
# #
# Mac OS X + XCode # OS X + Xcode
# #
include(../$$[QMAKE_XSPEC]/qmake.conf) include(../$$[QMAKE_XSPEC]/qmake.conf)