Changeset 561 for trunk/src/tools/bootstrap/bootstrap.pri
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible /branches/vendor/nokia/qt/current merged eligible /branches/vendor/trolltech/qt/current 3-149
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/src/tools/bootstrap/bootstrap.pri
r2 r561 29 29 $$QT_BUILD_TREE/include/QtCore \ 30 30 $$QT_BUILD_TREE/include/QtXml \ 31 ../../xml31 /xml 32 32 DEPENDPATH += $$INCLUDEPATH \ 33 ../../corelib/global \34 ../../corelib/kernel \35 ../../corelib/tools \36 ../../corelib/io \37 ../../corelib/codecs \38 ../../xml33 /corelib/global \ 34 /corelib/kernel \ 35 /corelib/tools \ 36 /corelib/io \ 37 /corelib/codecs \ 38 /xml 39 39 40 40 hpux-acc*|hpuxi-acc* { 41 LIBS += ../bootstrap/libbootstrap.a41 LIBS += /bootstrap/libbootstrap.a 42 42 } else { 43 43 contains(CONFIG, debug_and_release_target) { 44 44 CONFIG(debug, debug|release) { 45 LIBS+=-L ../bootstrap/debug45 LIBS+=-L/bootstrap/debug 46 46 } else { 47 LIBS+=-L ../bootstrap/release47 LIBS+=-L/bootstrap/release 48 48 } 49 49 } else { 50 LIBS += -L ../bootstrap50 LIBS += -L/bootstrap 51 51 } 52 52 LIBS += -lbootstrap
Note:
See TracChangeset
for help on using the changeset viewer.