diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-13 22:18:43 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-13 22:19:10 +0200 |
| commit | 3d4aeb791990f359e277efbfb0a1f1793945b55d (patch) | |
| tree | e877b7b4ad76d554aa3dbe6131d03b98a7447c63 /qmake | |
| parent | b861c43395b17d5df34f24853faa21b9824a53af (diff) | |
| parent | c8de2a8b5f5d0b9b3bc1d8ed8d3027ac40b00ee3 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/gui/kernel/qguiapplication.cpp
Change-Id: Ibe75603dc8a51769db6550ea3f07bc8d19b0be85
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/qmake.pri | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/qmake.pri b/qmake/qmake.pri index 73757ee086..4457b2643b 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -137,7 +137,8 @@ bootstrap { #Qt code unix { SOURCES += qfilesystemengine_unix.cpp qfilesystemiterator_unix.cpp qfsfileengine_unix.cpp mac { - SOURCES += qcore_mac.cpp qsettings_mac.cpp qlocale_mac.mm + SOURCES += qcore_mac.cpp qsettings_mac.cpp + OBJECTIVE_SOURCES += qlocale_mac.mm LIBS += -framework ApplicationServices } else { SOURCES += qlocale_unix.cpp |