diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-06-24 17:19:46 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-06-24 17:19:46 (GMT) |
| commit | 4f51c89ebdd15d5131b789070384a6ab062073a7 (patch) | |
| tree | 378c8135cab58cd3254486a2d8f3fa2ad6d40c60 /demos/qtdemo | |
| parent | 9adf2ec67251099b1807eb586367fda4cf60ff40 (diff) | |
| parent | d86679ee600bd26788b5bbcd27abf078f0ec948c (diff) | |
| download | Qt-4f51c89ebdd15d5131b789070384a6ab062073a7.zip Qt-4f51c89ebdd15d5131b789070384a6ab062073a7.tar.gz Qt-4f51c89ebdd15d5131b789070384a6ab062073a7.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'demos/qtdemo')
| -rw-r--r-- | demos/qtdemo/qtdemo.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/qtdemo/qtdemo.pro b/demos/qtdemo/qtdemo.pro index 4d4177e..61ea376 100644 --- a/demos/qtdemo/qtdemo.pro +++ b/demos/qtdemo/qtdemo.pro @@ -1,4 +1,4 @@ -CONFIG += assistant help x11inc +CONFIG += help x11inc TARGET = qtdemo DEMO_DESTDIR = $$QT_BUILD_TREE isEmpty(DEMO_DESTDIR):DEMO_DESTDIR=../.. |