summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill King <bking@trolltech.com>2009-08-18 00:04:58 (GMT)
committerBill King <bking@trolltech.com>2009-08-18 00:06:57 (GMT)
commit4b7e40ac69cbec8fcf9a12d71c3911579247fc4b (patch)
tree765348c90e9264e840940836a7d7d3925a81e404
parent5bc376247a07a79be4a04bf33b44d4fd85a6ae97 (diff)
downloadQt-4b7e40ac69cbec8fcf9a12d71c3911579247fc4b.zip
Qt-4b7e40ac69cbec8fcf9a12d71c3911579247fc4b.tar.gz
Qt-4b7e40ac69cbec8fcf9a12d71c3911579247fc4b.tar.bz2
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
-rw-r--r--tests/auto/auto.pro20
1 files 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