switch to new-style configure tests

Change-Id: Iae80d8e22f4f5347b020c20364bfe110c22bc549
Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>

11 files changed, 28 insertions, 30 deletions

diff --git a/examples/serviceframework/dialer/dialer.pro b/examples/serviceframework/dialer/dialer.pro
index cd417706..45cf9e91 100644
--- a/examples/serviceframework/dialer/dialer.pro
+++ b/examples/serviceframework/dialer/dialer.pro
@@ -35,7 +35,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS $$QML_MISC_FILES dialer.
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtsystems/serviceframework/dialer
 qmlsources.files = $$QML_CONTENT_FILES
 qmlsources.path = $$[QT_INSTALL_EXAMPLES]/qtsystems/serviceframework/dialer/content
-mtlib|contains(config_test_mtlib, yes) {
+mtlib|config_mtlib {
     info.path = $$[QT_INSTALL_EXAMPLES]/qtsystems/serviceframework/dialer
     info.files = info.json
 }
diff --git a/examples/serviceframework/remotedialerservice/remotedialerservice.pro b/examples/serviceframework/remotedialerservice/remotedialerservice.pro
index e9176b43..517e385e 100644
--- a/examples/serviceframework/remotedialerservice/remotedialerservice.pro
+++ b/examples/serviceframework/remotedialerservice/remotedialerservice.pro
@@ -14,7 +14,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS remotedialerservice.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtsystems/serviceframework/remotedialerservice
 xml.path = $$[QT_INSTALL_EXAMPLES]/qtsystems/serviceframework/xmldata
 xml.files = remotedialerservice.xml
-mtlib|contains(config_test_mtlib, yes) {
+mtlib|config_mtlib {
     info.path = $$[QT_INSTALL_EXAMPLES]/qtsystems/serviceframework/remotedialerservice
     info.files = info.json interfaces.json
 }
diff --git a/qtsystems.pro b/qtsystems.pro
index b3a101d1..b9b325d4 100644
--- a/qtsystems.pro
+++ b/qtsystems.pro
@@ -1,3 +1,10 @@
+load(configure)
+qtCompileTest(gconf)
+qtCompileTest(bluez)
+qtCompileTest(udev)
+qtCompileTest(x11)
+qtCompileTest(libsysinfo)
+
 TEMPLATE = subdirs
 CONFIG += ordered
 
diff --git a/src/imports/serviceframework/serviceframework.pro b/src/imports/serviceframework/serviceframework.pro
index 09079a23..70b09a21 100644
--- a/src/imports/serviceframework/serviceframework.pro
+++ b/src/imports/serviceframework/serviceframework.pro
@@ -21,7 +21,7 @@ SOURCES += qdeclarativeservice.cpp \
            serviceframework.cpp 
 
 jsondb|contains(QT_CONFIG, jsondb): {
-    mtlib|contains(config_test_mtlib, yes): {
+    mtlib|config_mtlib {
         DEFINES += QT_NO_DBUS QT_MTCLIENT_PRESENT
     }
 }
diff --git a/src/publishsubscribe/publishsubscribe.pro b/src/publishsubscribe/publishsubscribe.pro
index b5534886..9ac6b6e9 100644
--- a/src/publishsubscribe/publishsubscribe.pro
+++ b/src/publishsubscribe/publishsubscribe.pro
@@ -27,7 +27,7 @@ SOURCES = qvaluespace.cpp \
 
 unix {
     linux-* {
-        contains(config_test_gconf, yes) {
+        config_gconf {
             PRIVATE_HEADERS += gconfitem_p.h \
                                gconflayer_p.h
 
diff --git a/src/systeminfo/systeminfo.pro b/src/systeminfo/systeminfo.pro
index f2d851e2..4e092730 100644
--- a/src/systeminfo/systeminfo.pro
+++ b/src/systeminfo/systeminfo.pro
@@ -71,7 +71,7 @@ linux-*: !simulator: {
                qscreensaver_linux.cpp \
                qdeviceprofile_linux.cpp
 
-    x11|contains(config_test_x11, yes): {
+    x11|config_x11 {
         CONFIG += link_pkgconfig
         PKGCONFIG += x11
     } else: {
@@ -86,14 +86,14 @@ linux-*: !simulator: {
         DEFINES += QT_NO_JSONDB QT_NO_MTLIB
     }
 
-    mtlib|contains(config_test_mtlib, yes): {
+    mtlib|config_mtlib {
         CONFIG += link_pkgconfig
         PKGCONFIG += mt-client
     } else: {
         DEFINES += QT_NO_MTLIB
     }
 
-    contains(config_test_bluez, yes): {
+    config_bluez {
         CONFIG += link_pkgconfig
         PKGCONFIG += bluez
     } else: {
@@ -109,7 +109,7 @@ linux-*: !simulator: {
     }
 
     contains(QT_CONFIG, dbus): {
-        contains(config_test_ofono, yes) : !contains(QT_CONFIG, sfw_netreg) {
+        config_ofono:!contains(QT_CONFIG, sfw_netreg) {
             QT += dbus
             PRIVATE_HEADERS += qofonowrapper_p.h
             SOURCES += qofonowrapper.cpp
@@ -117,7 +117,7 @@ linux-*: !simulator: {
             DEFINES += QT_NO_OFONO
         }
 
-        contains(config_test_udisks, yes): {
+        config_udisks {
             QT += dbus
         } else: {
             DEFINES += QT_NO_UDISKS
@@ -126,7 +126,7 @@ linux-*: !simulator: {
         DEFINES += QT_NO_OFONO QT_NO_UDISKS
     }
 
-    contains(config_test_udev, yes) {
+    config_udev {
         CONFIG += link_pkgconfig
         PKGCONFIG += udev
         LIBS += -ludev
@@ -136,7 +136,7 @@ linux-*: !simulator: {
         DEFINES += QT_NO_UDEV
     }
 
-    contains(config_test_libsysinfo, yes): {
+    config_libsysinfo {
         CONFIG += link_pkgconfig
         PKGCONFIG += sysinfo
         LIBS += -lsysinfo
@@ -171,7 +171,7 @@ simulator {
                    qdeviceprofile_linux.cpp \
                    qstorageinfo_linux.cpp
 
-        x11|contains(config_test_x11, yes): {
+        x11|config_x11 {
             CONFIG += link_pkgconfig
             PKGCONFIG += x11
         } else: {
@@ -189,14 +189,14 @@ simulator {
             DEFINES += QT_NO_JSONDB QT_NO_MTLIB
         }
 
-        mtlib|contains(config_test_mtlib, yes): {
+        mtlib|config_mtlib {
             CONFIG += link_pkgconfig
             PKGCONFIG += mt-client
         } else: {
             DEFINES += QT_NO_MTLIB
         }
 
-        contains(config_test_bluez, yes): {
+        config_bluez {
             CONFIG += link_pkgconfig
             PKGCONFIG += bluez
         } else: {
@@ -215,7 +215,7 @@ simulator {
         }
 
         contains(QT_CONFIG, dbus): {
-            contains(config_test_ofono, yes) : !contains(QT_CONFIG, sfw_netreg) {
+            config_ofono:!contains(QT_CONFIG, sfw_netreg) {
             QT += dbus
             PRIVATE_HEADERS += qofonowrapper_p.h \
                                qnetworkinfo_linux_p.h
@@ -234,7 +234,7 @@ simulator {
             DEFINES += QT_NO_OFONO QT_NO_UDISKS
         }
 
-        contains(config_test_udev, yes) {
+        config_udev {
             CONFIG += link_pkgconfig
             PKGCONFIG += udev
             LIBS += -ludev
@@ -244,7 +244,7 @@ simulator {
             DEFINES += QT_NO_UDEV
         }
 
-        contains(config_test_libsysinfo, yes): {
+        config_libsysinfo {
             CONFIG += link_pkgconfig
             PKGCONFIG += sysinfo
             LIBS += -lsysinfo
diff --git a/sync.profile b/sync.profile
index 518223c7..c3587c48 100644
--- a/sync.profile
+++ b/sync.profile
@@ -27,12 +27,3 @@
     "qtdeclarative" => "refs/heads/master",
     "qtjsbackend" => "refs/heads/master",
 );
-
-# Compile tests
-%configtests = (
-    "gconf" => {},
-    "bluez" => {},
-    "udev" => {},
-    "x11" => {},
-    "libsysinfo" => {}
-);
diff --git a/tests/auto/publishsubscribe/qvaluespace/qvaluespace.pro b/tests/auto/publishsubscribe/qvaluespace/qvaluespace.pro
index 20b8cb9f..8deed4de 100644
--- a/tests/auto/publishsubscribe/qvaluespace/qvaluespace.pro
+++ b/tests/auto/publishsubscribe/qvaluespace/qvaluespace.pro
@@ -2,7 +2,7 @@ include(../../auto.pri)
 
 QT += publishsubscribe
 
-!contains(config_test_gconf, yes) {
+!config_gconf {
     DEFINES += QT_NO_GCONFLAYER
 }
 
diff --git a/tests/auto/serviceframework/qservicemanager/tst_qservicemanager.pro b/tests/auto/serviceframework/qservicemanager/tst_qservicemanager.pro
index ee417dd2..78f93310 100644
--- a/tests/auto/serviceframework/qservicemanager/tst_qservicemanager.pro
+++ b/tests/auto/serviceframework/qservicemanager/tst_qservicemanager.pro
@@ -5,7 +5,7 @@ QT = core sql serviceframework serviceframework-private testlib
 QT -= gui
 
 jsondb|contains(QT_CONFIG, jsondb) {
-    mtlib|contains(config_test_mtlib, yes) {
+    mtlib|config_mtlib {
         DEFINES += QT_ADDON_JSONDB_LIB
         QT += jsondb
     }
diff --git a/tests/auto/serviceframework/qservicemanager_ipc/client/client.pro b/tests/auto/serviceframework/qservicemanager_ipc/client/client.pro
index cb6cd6d2..2f1cc7e1 100644
--- a/tests/auto/serviceframework/qservicemanager_ipc/client/client.pro
+++ b/tests/auto/serviceframework/qservicemanager_ipc/client/client.pro
@@ -11,7 +11,7 @@ win32-msvc*:QMAKE_LFLAGS += /STACK:4194304
 CONFIG -= app_bundle
 
 jsondb|contains(QT_CONFIG, jsondb): {
-    mtlib|contains(config_test_mtlib, yes): {
+    mtlib|config_mtlib {
         DEFINES += QT_JSONDB
     }
 }
diff --git a/tests/auto/serviceframework/qservicemanager_ipc/service/service.pro b/tests/auto/serviceframework/qservicemanager_ipc/service/service.pro
index 7050272a..c29ebf04 100644
--- a/tests/auto/serviceframework/qservicemanager_ipc/service/service.pro
+++ b/tests/auto/serviceframework/qservicemanager_ipc/service/service.pro
@@ -8,7 +8,7 @@ mac {
 DESTDIR = ../client  #service must be in same dir as client binary
 
 jsondb|contains(QT_CONFIG, jsondb) {
-    mtlib|contains(config_test_mtlib, yes) {
+    mtlib|config_mtlib {
         DEFINES += QT_JSONDB
     }
 }