diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2012-07-26 12:47:33 -0500 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-13 14:52:25 +0200 |
| commit | addc9984fb590f7bcd4c22ed752c87d93530fda3 (patch) | |
| tree | 1678a38b414bb599f00155641c37fa143dfdd47b /qmake/qmake.pri | |
| parent | 46e2c9441761f75f19b2780e8f1616102128dedd (diff) | |
Sync .pr[oi] with the Makefiles so qmake builds again
Change-Id: Ief766ac61f98859b84fc61b03b8c1292d3c06525
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'qmake/qmake.pri')
| -rw-r--r-- | qmake/qmake.pri | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/qmake/qmake.pri b/qmake/qmake.pri index 7bbecdc648..a9f17c4a23 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -128,12 +128,14 @@ bootstrap { #Qt code SOURCES += qfilesystemengine_unix.cpp qfilesystemiterator_unix.cpp qfsfileengine_unix.cpp mac { SOURCES += qfilesystemengine_mac.cpp - SOURCES += qcore_mac.cpp qsettings_mac.cpp + SOURCES += qcore_mac.cpp qsettings_mac.cpp qlocale_mac.mm LIBS += -framework ApplicationServices + } else { + SOURCES += qlocale_unix.cpp } } else:win32 { SOURCES += qfilesystemengine_win.cpp qfsfileengine_win.cpp qfilesystemiterator_win.cpp qsettings_win.cpp \ - qsystemlibrary.cpp + qsystemlibrary.cpp qlocale_win.cpp registry.cpp win32-msvc*:LIBS += ole32.lib advapi32.lib win32-g++*:LIBS += -lole32 -luuid -ladvapi32 -lkernel32 } @@ -144,7 +146,7 @@ bootstrap { #Qt code } DEFINES *= QT_NO_QOBJECT } else { - CONFIG += qt + CONFIG += qt QT = core } *-g++:profiling { |