diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-19 04:06:02 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-19 04:06:02 (GMT) |
| commit | f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682 (patch) | |
| tree | 65f3b637a19ff47fcc97e3f22deeae7d843cad17 /src/tools/bootstrap/bootstrap.pri | |
| parent | 331ad8eb0aedb4baefcaf6f08a8e0ce440a32b06 (diff) | |
| parent | 8a7de547942c9a660dfc45c176ea1a3027bbf99a (diff) | |
| download | Qt-f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682.zip Qt-f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682.tar.gz Qt-f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682.tar.bz2 | |
Merge remote branch 'origin/4.7' into oslo-staging-1
Conflicts:
mkspecs/common/symbian/symbian.conf
Diffstat (limited to 'src/tools/bootstrap/bootstrap.pri')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pri | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri index 6442526..1de7b18 100644 --- a/src/tools/bootstrap/bootstrap.pri +++ b/src/tools/bootstrap/bootstrap.pri @@ -42,12 +42,12 @@ hpux-acc*|hpuxi-acc* { } else { contains(CONFIG, debug_and_release_target) { CONFIG(debug, debug|release) { - LIBS+=-L$$QT_BUILD_TREE/src/tools/bootstrap/debug + QMAKE_LIBDIR += $$QT_BUILD_TREE/src/tools/bootstrap/debug } else { - LIBS+=-L$$QT_BUILD_TREE/src/tools/bootstrap/release + QMAKE_LIBDIR += $$QT_BUILD_TREE/src/tools/bootstrap/release } } else { - LIBS += -L$$QT_BUILD_TREE/src/tools/bootstrap + QMAKE_LIBDIR += $$QT_BUILD_TREE/src/tools/bootstrap } LIBS += -lbootstrap } @@ -62,3 +62,12 @@ mac { LIBS += -framework CoreServices } +# Make dummy "sis" and "freeze" target to keep recursive "make sis/freeze" working. +sis_target.target = sis +sis_target.commands = +sis_target.depends = first +QMAKE_EXTRA_TARGETS += sis_target +freeze_target.target = freeze +freeze_target.commands = +freeze_target.depends = first +QMAKE_EXTRA_TARGETS += freeze_target |