Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/src/tools/bootstrap/bootstrap.pri

    r2 r561  
    2929                   $$QT_BUILD_TREE/include/QtCore \
    3030                   $$QT_BUILD_TREE/include/QtXml \
    31                    ../../xml
     31                   /xml
    3232DEPENDPATH      += $$INCLUDEPATH \
    33                    ../../corelib/global \
    34                    ../../corelib/kernel \
    35                    ../../corelib/tools \
    36                    ../../corelib/io \
    37                    ../../corelib/codecs \
    38                    ../../xml
     33                   /corelib/global \
     34                   /corelib/kernel \
     35                   /corelib/tools \
     36                   /corelib/io \
     37                   /corelib/codecs \
     38                   /xml
    3939
    4040hpux-acc*|hpuxi-acc* {
    41     LIBS += ../bootstrap/libbootstrap.a
     41    LIBS += /bootstrap/libbootstrap.a
    4242} else {
    4343    contains(CONFIG, debug_and_release_target) {
    4444        CONFIG(debug, debug|release) {
    45             LIBS+=-L../bootstrap/debug
     45            LIBS+=-L/bootstrap/debug
    4646        } else {
    47             LIBS+=-L../bootstrap/release
     47            LIBS+=-L/bootstrap/release
    4848        }
    4949    } else {
    50         LIBS += -L../bootstrap
     50        LIBS += -L/bootstrap
    5151    }
    5252    LIBS += -lbootstrap

  • trunk/src/tools/bootstrap/bootstrap.pro

    r60 r561  
    3131INCLUDEPATH += $$QT_BUILD_TREE/include \
    3232            $$QT_BUILD_TREE/include/QtCore \
    33             $$QT_BUILD_TREE/include/QtXml \
     33            $$QT_BUILD_TREE/include/QtXml
    3434
    3535DEPENDPATH += $$INCLUDEPATH \
    … …  
    5353           ../../corelib/io/qabstractfileengine.cpp \
    5454           ../../corelib/io/qbuffer.cpp \
     55
    5556           ../../corelib/io/qdir.cpp \
    5657           ../../corelib/io/qdiriterator.cpp \
    … …  
    7071           ../../corelib/tools/qdatetime.cpp \
    7172           ../../corelib/tools/qhash.cpp \
    72            ../../corelib/tools/qlistdata.cpp \
     73           ../../corelib/tools/qlist.cpp \
    7374           ../../corelib/tools/qlocale.cpp \
    7475           ../../corelib/tools/qmap.cpp \
    … …  
    9394                 
    9495macx: {
    95    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 #enables weak linking for 10.3 (exported)
     96   QMAKE_MACOSX_DEPLOYMENT_TARGET = 10. (exported)
    9697   SOURCES += ../../corelib/kernel/qcore_mac.cpp
    9798   LIBS += -framework CoreServices
Note: See TracChangeset for help on using the changeset viewer.