From addc9984fb590f7bcd4c22ed752c87d93530fda3 Mon Sep 17 00:00:00 2001
From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Date: Thu, 26 Jul 2012 12:47:33 -0500
Subject: Sync .pr[oi] with the Makefiles so qmake builds again

Change-Id: Ief766ac61f98859b84fc61b03b8c1292d3c06525
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
 qmake/qmake.pri | 8 +++++---
 qmake/qmake.pro | 5 ++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'qmake')

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 {
diff --git a/qmake/qmake.pro b/qmake/qmake.pro
index 0693d9a4ac..2b897f1e80 100644
--- a/qmake/qmake.pro
+++ b/qmake/qmake.pro
@@ -19,7 +19,9 @@ VPATH += $$QT_SOURCE_TREE/src/corelib/global \
          $$QT_SOURCE_TREE/src/corelib/codecs \
          $$QT_SOURCE_TREE/src/corelib/plugin \
          $$QT_SOURCE_TREE/src/corelib/xml \
-         $$QT_SOURCE_TREE/src/corelib/io
+         $$QT_SOURCE_TREE/src/corelib/io \
+         $$QT_SOURCE_TREE/tools/shared/windows
+
 INCLUDEPATH += . \
            generators \
            generators/unix \
@@ -30,6 +32,7 @@ INCLUDEPATH += . \
            $$QT_SOURCE_TREE/include/QtCore \
            $$QT_SOURCE_TREE/include/QtCore/$$QT_VERSION \
            $$QT_SOURCE_TREE/include/QtCore/$$QT_VERSION/QtCore \
+           $$QT_SOURCE_TREE/tools/shared \
            $$QT_SOURCE_TREE/qmake
 
 include(qmake.pri)
-- 
cgit v1.2.3