summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorThomas Zander <thomas.zander@trolltech.com>2009-06-10 09:18:37 (GMT)
committerThomas Zander <thomas.zander@trolltech.com>2009-06-10 09:19:44 (GMT)
commitc0becf8cb47312ec14a2b28e2a76a1d87a8e183e (patch)
tree58af2e8db666dfedcf3cf50e4dbce1168d4dfe71 /demos
parentb2b0ac2f9abf58456e2dad2340c77c6004464a34 (diff)
downloadQt-c0becf8cb47312ec14a2b28e2a76a1d87a8e183e.zip
Qt-c0becf8cb47312ec14a2b28e2a76a1d87a8e183e.tar.gz
Qt-c0becf8cb47312ec14a2b28e2a76a1d87a8e183e.tar.bz2
BT: Fixes building qtdemo in the installed tree of sources.
The QT_BUILD_TREE variable only works in the source or build dir, but fails in the demo which *install* the sources that should be buildable too. Reviewed-by: Marius Storm-Olsen
Diffstat (limited to 'demos')
-rw-r--r--demos/qtdemo/qtdemo.pro4
1 files changed, 3 insertions, 1 deletions
diff --git a/demos/qtdemo/qtdemo.pro b/demos/qtdemo/qtdemo.pro
index 2534b75..163ed17 100644
--- a/demos/qtdemo/qtdemo.pro
+++ b/demos/qtdemo/qtdemo.pro
@@ -1,6 +1,8 @@
CONFIG += assistant help x11inc
TARGET = qtdemo
-DESTDIR = $$QT_BUILD_TREE/bin
+DEMO_DESTDIR = $$QT_BUILD_TREE
+isEmpty(DEMO_DESTDIR):DEMO_DESTDIR=../..
+DESTDIR = $$DEMO_DESTDIR/bin
OBJECTS_DIR = .obj
MOC_DIR = .moc
INSTALLS += target sources