Changeset 846 for trunk/qmake/qmake.pri

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• qmake/qmake.pri (modified) (3 diffs)

trunk/qmake/qmake.pri

@@ -8 +8 @@
            generators/xmloutput.cpp generators/win32/borland_bmake.cpp \
            generators/win32/msvc_nmake.cpp generators/projectgenerator.cpp \
-           generators/win32/msvc_dsp.cpp generators/win32/msvc_vcproj.cpp \
-           generators/win32/msvc_objectmodel.cpp \
+           generators/win32/msvc_vcproj.cpp \
+           generators/win32/msvc_vcxproj.cpp \
+           generators/win32/msvc_objectmodel.cpp generators/win32/msbuild_objectmodel.cpp \
+           generators/symbian/symbiancommon.cpp \
            generators/symbian/symmake.cpp \
            generators/symbian/symmake_abld.cpp \
            generators/symbian/symmake_sbsv2.cpp \
            generators/symbian/initprojectdeploy_symbian.cpp \
+           generators/os2/gnumake.cpp \
            windows/registry.cpp \
-           symbian/epocroot.cpp \
-           generators/os2/gnumake.cpp
+           symbian/epocroot.cpp
 
 HEADERS += project.h property.h generators/makefile.h \
            generators/unix/unixmake.h meta.h option.h cachekeys.h \
-           generators/win32/winmakefile.h generators/projectgenerator.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/win32/msvc_dsp.h generators/win32/msvc_vcproj.h \
-           generators/win32/mingw_make.h generators/win32/msvc_objectmodel.h \
+           generators/win32/msvc_vcproj.h \
+           generators/win32/msvc_vcxproj.h \
+           generators/win32/msvc_objectmodel.h generators/win32/msbuild_objectmodel.h \
+           generators/symbian/symbiancommon.h \
            generators/symbian/symmake.h \
            generators/symbian/symmake_abld.h \
            generators/symbian/symmake_sbsv2.h \
            generators/symbian/initprojectdeploy_symbian.h \
-           windows/registry.h \
-           symbian/epocroot.h \
            generators/os2/gnumake.h
+           windows/registry_p.h \
+           symbian/epocroot_p.h
 
 contains(QT_EDITION, OpenSource) {
@@ -41 +45 @@
    SKIP_DEPENDS += qconfig.h qmodules.h
    DEFINES += QT_NO_TEXTCODEC QT_NO_LIBRARY QT_NO_STL QT_NO_COMPRESS QT_NO_UNICODETABLES \
-              QT_NO_GEOM_VARIANT QT_NO_DATASTREAM
+              QT_NO_GEOM_VARIANT QT_NO_DATASTREAM QLIBRARYINFO_EPOCROOT
    DEFINES+=QT_NODLL QT_NO_THREAD
    SOURCES+= \
@@ -130 +134 @@
         }
     } else:win32 {
-        SOURCES += qfsfileengine_win.cpp qfsfileengine_iterator_win.cpp qsettings_win.cpp
+        SOURCES += qfsfileengine_win.cpp qfsfileengine_iterator_win.cpp qsettings_win.cpp \
+            qsystemlibrary.cpp
         win32-msvc*:LIBS += ole32.lib advapi32.lib
-        win32-g++:LIBS += -lole32 -luuid
+        win32-g++*:LIBS += -lole32 -luuid
     } else:os2 {
         SOURCES += qfsfileengine_os2.cpp qfsfileengine_iterator_os2.cpp qsettings_os2.cpp