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/mac.conf | |
| 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/mac.conf')
| -rw-r--r-- | mkspecs/common/mac.conf | 2 |
1 files changed, 1 insertions, 1 deletions
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) |