diff options
| author | Joerg Bornemann <joerg.bornemann@trolltech.com> | 2009-07-20 10:53:09 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@trolltech.com> | 2009-07-20 11:00:36 (GMT) |
| commit | acea2ceaeb168f0ceaa04988a541bbf11a7af85e (patch) | |
| tree | b6d26e41c5ec35c091c3cb8822faf391f73a0b3c | |
| parent | 329c9329a61267ede929a96af6b26a286c666fc8 (diff) | |
| download | Qt-acea2ceaeb168f0ceaa04988a541bbf11a7af85e.zip Qt-acea2ceaeb168f0ceaa04988a541bbf11a7af85e.tar.gz Qt-acea2ceaeb168f0ceaa04988a541bbf11a7af85e.tar.bz2 | |
make the boostrap lib work for projects that aren't in src/tools
This is preparation for making Windows CE checksdk use the bootstrap
lib.
Reviewed-by: thartman
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pri | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri index 1cf103b..b4f9b2f 100644 --- a/src/tools/bootstrap/bootstrap.pri +++ b/src/tools/bootstrap/bootstrap.pri @@ -28,26 +28,26 @@ win32:DEFINES += QT_NODLL INCLUDEPATH += $$QT_BUILD_TREE/include \ $$QT_BUILD_TREE/include/QtCore \ $$QT_BUILD_TREE/include/QtXml \ - ../../xml + $$QT_SOURCE_TREE/src/xml DEPENDPATH += $$INCLUDEPATH \ - ../../corelib/global \ - ../../corelib/kernel \ - ../../corelib/tools \ - ../../corelib/io \ - ../../corelib/codecs \ - ../../xml + $$QT_SOURCE_TREE/src/corelib/global \ + $$QT_SOURCE_TREE/src/corelib/kernel \ + $$QT_SOURCE_TREE/src/corelib/tools \ + $$QT_SOURCE_TREE/src/corelib/io \ + $$QT_SOURCE_TREE/src/corelib/codecs \ + $$QT_SOURCE_TREE/src/xml hpux-acc*|hpuxi-acc* { LIBS += ../bootstrap/libbootstrap.a } else { contains(CONFIG, debug_and_release_target) { CONFIG(debug, debug|release) { - LIBS+=-L../bootstrap/debug + LIBS+=-L$$QT_BUILD_TREE/src/tools/bootstrap/debug } else { - LIBS+=-L../bootstrap/release + LIBS+=-L$$QT_BUILD_TREE/src/tools/bootstrap/release } } else { - LIBS += -L../bootstrap + LIBS += -L$$QT_BUILD_TREE/src/tools/bootstrap } LIBS += -lbootstrap } |