From 4b7e40ac69cbec8fcf9a12d71c3911579247fc4b Mon Sep 17 00:00:00 2001
From: Bill King <bking@trolltech.com>
Date: Tue, 18 Aug 2009 10:04:58 +1000
Subject: Fixes qmake -tp vc

qmake -tp vc (rightfully) borks when it tries to include .pros that
it shouldn't be, based upon platform.

Reviewed-by: Rohan McGovern
---
 tests/auto/auto.pro | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 585f461..1ae6913 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -11,8 +11,6 @@ SUBDIRS += \
            compilerwarnings \
            exceptionsafety \
            linguist \
-           macgui \
-           macplist \
            mediaobject \
 #           mediaobject_wince_ds9 \   This is Windows CE only (we test the second phonon backend ds9 here)
            moc \
@@ -74,7 +72,6 @@ SUBDIRS += \
            qabstractspinbox \
            qabstracttextdocumentlayout \
            qaccessibility \
-           qaccessibility_mac \
            qaction \
            qactiongroup \
            qalgorithms \
@@ -97,7 +94,6 @@ SUBDIRS += \
            qcombobox \
            qcompleter \
            qcomplextext \
-           qcopchannel \
            qcoreapplication \
            qcryptographichash \
            qcssparser \
@@ -113,7 +109,6 @@ SUBDIRS += \
            qdialog \
            qdialogbuttonbox \
            qdir \
-           qdirectpainter \
            qdirmodel \
            qdockwidget \
            qdom \
@@ -209,7 +204,6 @@ SUBDIRS += \
            qmouseevent \
            qmouseevent_modal \
            qmovie \
-           qmultiscreen \
            qmutex \
            qmutexlocker \
            qnativesocketengine \
@@ -349,7 +343,6 @@ SUBDIRS += \
            qtextlayout \
            qtextlist \
            qtextobject \
-           qtextpiecetable \
            qtextscriptengine \
            qtextstream \
            qtexttable \
@@ -404,6 +397,19 @@ SUBDIRS += \
            utf8
 
 contains(QT_CONFIG, OdfWriter):SUBDIRS += qzip qtextodfwriter
+mac: {
+    SUBDIRS += macgui \
+               macplist \
+               qaccessibility_mac
+}
+embedded: {
+    SUBDIRS += qcopchannel \
+               qdirectpainter \
+               qmultiscreen
+}
+!win32: {
+    SUBDIRS += qtextpiecetable
+}
 
 # Enable the tests specific to QtXmlPatterns. If you add a test, remember to
 # update runQtXmlPatternsTests.sh too. Remember that this file, auto.pro, is
-- 
cgit v0.12