diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-11 15:14:13 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-11 16:42:01 +0200 |
| commit | 3ef6cf060e984bca43956a23b61b32ec7347cfc7 (patch) | |
| tree | 14810e4d0168c0cc3d69cb286574bf28375c07bc /mkspecs/common | |
| parent | b06304e164ba47351fa292662c1e6383c081b5ca (diff) | |
| parent | 7b9d6cf844ece18fef884f51117e25ad4ac31db5 (diff) | |
Merge branch 'stable' into dev
Conflicts:
qmake/generators/mac/pbuilder_pbx.cpp
src/corelib/json/qjsonwriter.cpp
src/corelib/kernel/qeventdispatcher_blackberry.cpp
src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
Change-Id: I24df576c4cbd18fa51b03122f71e32bb83b9028f
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 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 |