Make test .pro files more consistent.

Make the parent .pro files follow the pattern of listing all tests in
one place and then removing inapplicable tests as needed.

Change-Id: Ide1ae98d50dd63cd8c1b4d6fd53135cdff801bc3
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

tests/auto/auto.pro

@@ -2,15 +2,20 @@ TEMPLATE = subdirs
 
 SUBDIRS += \
     corelib.pro \
+    dbus \
+    host.pro \
     gui.pro \
     network.pro \
+    opengl \
     sql \
-    xml \
     testlib \
+    tools \
+    v8.pro \
+    xml \
     other.pro \
 
-!cross_compile:                             SUBDIRS += host.pro
-!cross_compile:                             SUBDIRS += tools
-contains(QT_CONFIG, opengl):                SUBDIRS += opengl
-unix:!embedded:contains(QT_CONFIG, dbus):   SUBDIRS += dbus
-contains(QT_CONFIG, v8):                    SUBDIRS += v8.pro
+cross_compile:                              SUBDIRS -= host.pro
+cross_compile:                              SUBDIRS -= tools
+!contains(QT_CONFIG, opengl):               SUBDIRS -= opengl
+!unix|embedded|!contains(QT_CONFIG, dbus):  SUBDIRS -= dbus
+!contains(QT_CONFIG, v8):                   SUBDIRS -= v8.pro

tests/auto/other.pro

@@ -5,14 +5,22 @@ TEMPLATE=subdirs
 SUBDIRS=\
            other \
 #           baselineexample \ Just an example demonstrating qbaselinetest usage
+           exceptionsafety_objects \
            lancelot \
+           macgui \
+           macnativeevents \
+           macplist \
            qaccessibility \
+           qaccessibility_mac \
            qcombobox \
+           qcopchannel \
+           qdirectpainter \
            qfocusevent \
            qlayout \
            qmdiarea \
            qmenu \
            qmenubar \
+           qmultiscreen \
            qsplitter \
            qtabwidget \
            qtextbrowser \
@@ -25,20 +33,18 @@ SUBDIRS=\
 
 wince*|!contains(QT_CONFIG, accessibility):SUBDIRS -= qaccessibility
 
-mac:!qpa {
-    SUBDIRS += macgui \
-               macnativeevents \
-               macplist \
-               qaccessibility_mac
-}
+!mac|qpa: SUBDIRS -= \
+           macgui \
+           macnativeevents \
+           macplist \
+           qaccessibility_mac \
 
-embedded:!wince* {
-    SUBDIRS += qcopchannel \
-               qdirectpainter \
-               qmultiscreen
-}
+!embedded|wince*: SUBDIRS -= \
+           qcopchannel \
+           qdirectpainter \
+           qmultiscreen \
 
-!win32-msvc*:!wince*:SUBDIRS += exceptionsafety_objects
+win32-msvc*|wince*:SUBDIRS -= exceptionsafety_objects
 
 # Following tests depends on private API
 !contains(QT_CONFIG, private_tests): SUBDIRS -= \

tests/auto/other/other.pro

@@ -1,10 +1,13 @@
 TEMPLATE=subdirs
 SUBDIRS=\
-   qtmd5 \
-   qtokenautomaton \
+   # atwrapper \ # QTBUG-19452
    baselineexample \
-
-!cross_compile: SUBDIRS += \
    compiler \
    headersclean \
-   # atwrapper \ # QTBUG-19452
+   qtmd5 \
+   qtokenautomaton \
+
+cross_compile: SUBDIRS -= \
+   atwrapper \
+   compiler \
+   headersclean \