diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-09-14 12:36:58 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-09-14 12:36:58 (GMT) |
| commit | 7769e7bf79f0c17a01874fa0b3f1b227c1e41e93 (patch) | |
| tree | e69de39b2e33323b8213d0d7e7469bd33d9fb60e /examples | |
| parent | 6cd8a6001fe87107d32524c6115d37b620d3e108 (diff) | |
| parent | 8399cce50eb11db885e67a52055505951309cae8 (diff) | |
| download | Qt-7769e7bf79f0c17a01874fa0b3f1b227c1e41e93.zip Qt-7769e7bf79f0c17a01874fa0b3f1b227c1e41e93.tar.gz Qt-7769e7bf79f0c17a01874fa0b3f1b227c1e41e93.tar.bz2 | |
Merge branch '4.7' of ../qt-doc-team into 4.7
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/examples.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index 1fdd774..f233aba 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -19,7 +19,6 @@ SUBDIRS = \ linguist \ mainwindows \ painting \ - qtconcurrent \ richtext \ sql \ tools \ @@ -67,6 +66,7 @@ contains(QT_CONFIG, declarative): SUBDIRS += declarative win32: SUBDIRS += activeqt contains(QT_CONFIG, xmlpatterns):!contains(QT_CONFIG, no-gui): SUBDIRS += xmlpatterns contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows +contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent # install sources.files = README *.pro |