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

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/tools/qdoc3/qdoc3.pro

    r561 r846  
    55#DEFINES += QT_USE_FAST_CONCATENATION
    66
    7 QT = core xml
    8 CONFIG += console
    9 CONFIG -= debug_and_release_target
     7qdoc_bootstrapped {
     8    include(../../src/tools/bootstrap/bootstrap.pri)
     9    SOURCES += ../../src/corelib/plugin/quuid.cpp
     10    DEFINES -= QT_NO_CAST_FROM_ASCII
     11    DEFINES += QT_NO_TRANSLATION
     12} else {
     13    QT = core xml
     14    CONFIG += console
     15    CONFIG -= debug_and_release_target
     16}
     17
    1018!isEmpty(QT_BUILD_TREE):DESTDIR = $$QT_BUILD_TREE/bin
    1119#CONFIG += debug
     
    1523#    CONFIG += debug
    1624}
    17 mac:CONFIG -= app_bundle
     25
     26CONFIG -= app_bundle
    1827HEADERS += apigenerator.h \
    1928           archiveextractor.h \
     
    3039           cpptoqsconverter.h \
    3140           dcfsection.h \
     41
    3242           doc.h \
    3343           editdistance.h \
     
    7484           cpptoqsconverter.cpp \
    7585           dcfsection.cpp \
     86
    7687           doc.cpp \
    7788           editdistance.cpp \
     
    106117           yyindent.cpp
    107118
     119
     120
     121
     122
     123
     124
     125
     126
    108127target.path = $$[QT_INSTALL_BINS]
    109128INSTALLS += target
Note: See TracChangeset for help on using the changeset viewer.