Changeset 561 for trunk/qmake/qmake.pri

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

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

trunk/qmake/qmake.pri

@@ -9 +9 @@
            generators/win32/msvc_nmake.cpp generators/projectgenerator.cpp \
            generators/win32/msvc_dsp.cpp generators/win32/msvc_vcproj.cpp \
-           generators/win32/msvc_objectmodel.cpp generators/os2/gnumake.cpp
+           generators/win32/msvc_objectmodel.cpp \
+           generators/symbian/symmake.cpp \
+           generators/symbian/symmake_abld.cpp \
+           generators/symbian/symmake_sbsv2.cpp \
+           generators/symbian/initprojectdeploy_symbian.cpp \
+           generators/os2/gnumake.cpp
+
 HEADERS += project.h property.h generators/makefile.h \
            generators/unix/unixmake.h meta.h option.h cachekeys.h \
@@ -17 +23 @@
            generators/win32/msvc_dsp.h generators/win32/msvc_vcproj.h \
            generators/win32/mingw_make.h generators/win32/msvc_objectmodel.h \
+
+
+
+
+
            generators/os2/gnumake.h
 
@@ -47 +58 @@
         qhash.cpp \
         qiodevice.cpp \
-        qlistdata.cpp \
+        qlist.cpp \
         qlinkedlist.cpp \
         qlocale.cpp \
@@ -54 +65 @@
         qmetatype.cpp \
         qregexp.cpp \
+
+
         qstring.cpp \
         qstringlist.cpp \
@@ -64 +77 @@
         qvariant.cpp \
         qvector.cpp \
-        qvsnprintf.cpp
+        qvsnprintf.cpp \
+        qxmlstream.cpp \
+        qxmlutils.cpp
 
    HEADERS+= \
@@ -80 +95 @@
         qabstractfileengine.h \
         qfileinfo.h \
-        qfileinfo_p.h \
         qglobal.h \
         qnumeric.h \
@@ -92 +106 @@
         qmetatype.h \
         qregexp.h \
+
+
         qstring.h \
         qstringlist.h \
@@ -99 +115 @@
         qurl.h \
         quuid.h \
-        qvector.h
+        qvector.h \
+        qxmlstream.h \
+        qxmlutils.h
 
     unix {
@@ -105 +123 @@
         mac {
           SOURCES += qcore_mac.cpp qsettings_mac.cpp
-          QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 #enables weak linking for 10.3 (exported)
+          QMAKE_MACOSX_DEPLOYMENT_TARGET = 10. (exported)
           LIBS += -framework ApplicationServices
         }
@@ -121 +139 @@
     }
     DEFINES *= QT_NO_QOBJECT
-    include($$QT_SOURCE_TREE/src/script/script.pri)
 } else {
     CONFIG += qt 
-    QT = core script
+    QT = core
 }
 *-g++:profiling {