diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-02-26 03:23:08 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-02-26 03:24:40 (GMT) |
| commit | 8a3eef027ffaeb69eeee89b7868c17c1f246edc8 (patch) | |
| tree | 3473fd95020ca92aa3ea9c69719c8dfe863dfd69 /tests/auto/auto.pro | |
| parent | a0278d4330e4aac8413055b5a34feb54ab74404d (diff) | |
| download | Qt-8a3eef027ffaeb69eeee89b7868c17c1f246edc8.zip Qt-8a3eef027ffaeb69eeee89b7868c17c1f246edc8.tar.gz Qt-8a3eef027ffaeb69eeee89b7868c17c1f246edc8.tar.bz2 | |
Work around requires() bug in qmake
when running `qmake -r -tp vc', if any project is encountered which is
disabled with requires(), the generated .sln file ends up missing many
unrelated projects.
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index e625c69..95c168a 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -313,8 +313,6 @@ SUBDIRS += \ qmediaserviceprovider \ qmediatimerange \ qvideowidget \ - qdeclarativeaudio \ - qdeclarativevideo \ qspinbox \ qsplitter \ qsql \ @@ -485,6 +483,9 @@ contains(QT_CONFIG,opengl):SUBDIRS += qgl qglbuffer qgl_threads contains(QT_CONFIG,qt3support):!wince*:SUBDIRS += $$Q3SUBDIRS +contains(QT_CONFIG,multimedia):contains(QT_CONFIG,declarative):SUBDIRS += qdeclarativeaudio \ + qdeclarativevideo + contains(QT_CONFIG, OdfWriter):SUBDIRS += qzip qtextodfwriter mac: { SUBDIRS += macgui \ |