Changeset 561 for trunk/src/tools/bootstrap/bootstrap.pro

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)
• src/tools/bootstrap/bootstrap.pro (modified) (4 diffs)

trunk/src/tools/bootstrap/bootstrap.pro

@@ -31 +31 @@
 INCLUDEPATH += $$QT_BUILD_TREE/include \
             $$QT_BUILD_TREE/include/QtCore \
-            $$QT_BUILD_TREE/include/QtXml \
+            $$QT_BUILD_TREE/include/QtXml
 
 DEPENDPATH += $$INCLUDEPATH \
@@ -53 +53 @@
            ../../corelib/io/qabstractfileengine.cpp \
            ../../corelib/io/qbuffer.cpp \
+           ../../corelib/io/qdatastream.cpp \
            ../../corelib/io/qdir.cpp \
            ../../corelib/io/qdiriterator.cpp \
@@ -70 +71 @@
            ../../corelib/tools/qdatetime.cpp \
            ../../corelib/tools/qhash.cpp \
-           ../../corelib/tools/qlistdata.cpp \
+           ../../corelib/tools/qlist.cpp \
            ../../corelib/tools/qlocale.cpp \
            ../../corelib/tools/qmap.cpp \
@@ -93 +94 @@
                  
 macx: {
-   QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 #enables weak linking for 10.3 (exported)
+   QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported)
    SOURCES += ../../corelib/kernel/qcore_mac.cpp
    LIBS += -framework CoreServices