diff options
| author | Thomas Zander <thomas.zander@trolltech.com> | 2009-06-10 09:18:37 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-06-10 09:31:24 (GMT) |
| commit | 30ce32c07744dbc95d8e2592543ebf91ffa037ad (patch) | |
| tree | 2515b87436fed3a6815960325f8352fc0a1ee62f | |
| parent | ae1394f33cacf11335ef87b7fc61d9e5afcb5425 (diff) | |
| download | Qt-30ce32c07744dbc95d8e2592543ebf91ffa037ad.zip Qt-30ce32c07744dbc95d8e2592543ebf91ffa037ad.tar.gz Qt-30ce32c07744dbc95d8e2592543ebf91ffa037ad.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
(cherry picked from commit c0becf8cb47312ec14a2b28e2a76a1d87a8e183e)
| -rw-r--r-- | demos/qtdemo/qtdemo.pro | 4 |
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 |