diff options
| author | axis <qt-info@nokia.com> | 2009-06-29 14:25:09 +0200 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-06-29 14:25:09 +0200 |
| commit | 1a8c89e9eaec05e9f38eae4fbc007d8344015de3 (patch) | |
| tree | d87e517cfab9443926841b3ef92ca715a717f54a /demos/qtdemo/qtdemo.pro | |
| parent | 78166d5235a5045fdc887febe01d789cac333bb3 (diff) | |
| parent | b6171cfbe3b1453a2c46f78db0df4819e4e5e54f (diff) | |
| download | qt4-tools-1a8c89e9eaec05e9f38eae4fbc007d8344015de3.tar.gz | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
.gitignore
src/gui/dialogs/qfiledialog_p.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontdatabase.cpp
tests/auto/network-settings.h
tests/auto/qitemdelegate/tst_qitemdelegate.cpp
Diffstat (limited to 'demos/qtdemo/qtdemo.pro')
| -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 18eac80156..6d3cf7d9d8 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 |