make QMakeMetaInfo a little less inefficient with libtool .la files

[profile/ivi/qtbase.git] / qmake / qmake.pri

diff --git a/qmake/qmake.pri b/qmake/qmake.pri
index cfa0c13..a9f17c4 100644 (file)
--- a/qmake/qmake.pri
+++ b/qmake/qmake.pri
@@ -9,29 +9,31 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \
            generators/unix/unixmake2.cpp generators/unix/unixmake.cpp meta.cpp \
            option.cpp generators/win32/winmakefile.cpp generators/win32/mingw_make.cpp \
            generators/makefiledeps.cpp generators/metamakefile.cpp generators/mac/pbuilder_pbx.cpp \
-           generators/xmloutput.cpp generators/win32/borland_bmake.cpp \
+           generators/xmloutput.cpp \
            generators/win32/msvc_nmake.cpp generators/projectgenerator.cpp \
            generators/win32/msvc_vcproj.cpp \
            generators/win32/msvc_vcxproj.cpp \
            generators/win32/msvc_objectmodel.cpp generators/win32/msbuild_objectmodel.cpp \
-           generators/integrity/gbuild.cpp
+           generators/integrity/gbuild.cpp \
+           generators/win32/cesdkhandler.cpp
 
 HEADERS += project.h property.h generators/makefile.h \
            generators/unix/unixmake.h meta.h option.h cachekeys.h \
            generators/win32/winmakefile.h generators/win32/mingw_make.h generators/projectgenerator.h \
            generators/makefiledeps.h generators/metamakefile.h generators/mac/pbuilder_pbx.h \
-           generators/xmloutput.h generators/win32/borland_bmake.h generators/win32/msvc_nmake.h \
+           generators/xmloutput.h generators/win32/msvc_nmake.h \
            generators/win32/msvc_vcproj.h \
            generators/win32/msvc_vcxproj.h \
            generators/win32/msvc_objectmodel.h generators/win32/msbuild_objectmodel.h \
-           generators/integrity/gbuild.h
+           generators/integrity/gbuild.h \
+           generators/win32/cesdkhandler.h
 
 contains(QT_EDITION, OpenSource) {
    DEFINES += QMAKE_OPENSOURCE_EDITION
 }
 
 bootstrap { #Qt code
-   DEFINES+=QT_NODLL QT_NO_THREAD
+   DEFINES+=QT_NO_THREAD
    SOURCES+= \
         qbitarray.cpp \
         qbuffer.cpp \
@@ -126,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
     }
@@ -142,7 +146,7 @@ bootstrap { #Qt code
     }
     DEFINES *= QT_NO_QOBJECT
 } else {
-    CONFIG += qt 
+    CONFIG += qt
     QT = core
 }
 *-g++:profiling {