diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-07-30 15:28:49 +0200 |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-07-30 15:28:49 +0200 |
| commit | a08b3f5336e5c819b33d922d3a809b5203d728f3 (patch) | |
| tree | 952f42304d50f28ed6651bace587ab7935b29cd0 /demos/demos.pro | |
| parent | 813fc3574a006cb2687715ccf7bdb984a485b173 (diff) | |
| parent | 188ac02e2fb6cc6437b776f8c5b69a508728fbdb (diff) | |
Merge commit 'qt/master-stable'
Conflicts:
demos/demos.pro
src/gui/graphicsview/qgraphicsitem_p.h
Diffstat (limited to 'demos/demos.pro')
| -rw-r--r-- | demos/demos.pro | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/demos/demos.pro b/demos/demos.pro index 3856591618..d734c05e92 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -13,7 +13,8 @@ SUBDIRS = \ demos_textedit \ demos_chip \ demos_embeddeddialogs \ - demos_undo + demos_undo \ + demos_sub-attaq symbian: SUBDIRS = \ demos_shared \ @@ -68,6 +69,7 @@ demos_mediaplayer.subdir = mediaplayer demos_browser.subdir = browser demos_boxes.subdir = boxes +demos_sub-attaq.subdir = sub-attaq #CONFIG += ordered !ordered { |