From 8a3eef027ffaeb69eeee89b7868c17c1f246edc8 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Fri, 26 Feb 2010 13:23:08 +1000 Subject: 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. --- tests/auto/auto.pro | 5 +++-- tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro | 2 -- tests/auto/qdeclarativevideo/qdeclarativevideo.pro | 2 -- 3 files changed, 3 insertions(+), 6 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 \ diff --git a/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro b/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro index f3262ee..13bf606 100644 --- a/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro +++ b/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro @@ -2,5 +2,3 @@ load(qttest_p4) SOURCES += tst_qdeclarativeaudio.cpp QT += multimedia declarative -requires(contains(QT_CONFIG, multimedia)) -requires(contains(QT_CONFIG, declarative)) diff --git a/tests/auto/qdeclarativevideo/qdeclarativevideo.pro b/tests/auto/qdeclarativevideo/qdeclarativevideo.pro index 0cd7879..d946bb0 100644 --- a/tests/auto/qdeclarativevideo/qdeclarativevideo.pro +++ b/tests/auto/qdeclarativevideo/qdeclarativevideo.pro @@ -2,5 +2,3 @@ load(qttest_p4) SOURCES += tst_qdeclarativevideo.cpp QT += multimedia declarative -requires(contains(QT_CONFIG, multimedia)) -requires(contains(QT_CONFIG, declarative)) -- cgit v0.12