switch to new-style configure tests

Change-Id: I70f4f4e81a042a977748dbb42b069b3706829828
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

diff --git a/qtwayland.pro b/qtwayland.pro
index 44d68b4..4a80275 100644 (file)
--- a/qtwayland.pro
+++ b/qtwayland.pro
@@ -1,3 +1,7 @@
+load(configure)
+qtCompileTest(xkbcommon)
+qtCompileTest(brcm_egl)
+
 TEMPLATE=subdirs
 CONFIG += ordered
 

diff --git a/src/compositor/hardware_integration/hardware_integration.pri b/src/compositor/hardware_integration/hardware_integration.pri
index 0156c49..372a1e1 100644 (file)
--- a/src/compositor/hardware_integration/hardware_integration.pri
+++ b/src/compositor/hardware_integration/hardware_integration.pri
@@ -16,7 +16,7 @@ isEmpty(QT_WAYLAND_GL_CONFIG):QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG)
             isEqual(QT_WAYLAND_GL_CONFIG, xcomposite_egl) {
                 QT_WAYLAND_GL_INTEGRATION = xcomposite_egl
                 CONFIG += xcomposite_egl
-            } else:isEqual(QT_WAYLAND_GL_CONFIG, brcm_egl)|isEmpty(QT_WAYLAND_GL_CONFIG):contains(config_test_brcm_egl,yes) {
+            } else:isEqual(QT_WAYLAND_GL_CONFIG, brcm_egl)|isEmpty(QT_WAYLAND_GL_CONFIG):config_brcm_egl {
                 QT_WAYLAND_GL_INTEGRATION = brcm_egl
                 CONFIG += brcm_egl
             } else {

diff --git a/src/plugins/platforms/wayland/gl_integration/gl_integration.pri b/src/plugins/platforms/wayland/gl_integration/gl_integration.pri
index e621c11..720f304 100644 (file)
--- a/src/plugins/platforms/wayland/gl_integration/gl_integration.pri
+++ b/src/plugins/platforms/wayland/gl_integration/gl_integration.pri
@@ -16,7 +16,7 @@ contains(QT_CONFIG, opengl):!equals(QT_WAYLAND_GL_CONFIG, nogl) {
         } else:isEqual(QT_WAYLAND_GL_CONFIG,readback) {
             QT_WAYLAND_GL_INTEGRATION = readback_egl
             CONFIG += readback_egl
-        } else:isEqual(QT_WAYLAND_GL_CONFIG, brcm_egl)|isEmpty(QT_WAYLAND_GL_CONFIG):contains(config_test_brcm_egl,yes) {
+        } else:isEqual(QT_WAYLAND_GL_CONFIG, brcm_egl)|isEmpty(QT_WAYLAND_GL_CONFIG):config_brcm_egl {
             QT_WAYLAND_GL_INTEGRATION = brcm_egl
             CONFIG += brcm_egl
         } else {

diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro
index 2059826..c8673b9 100644 (file)
--- a/src/plugins/platforms/wayland/wayland.pro
+++ b/src/plugins/platforms/wayland/wayland.pro
@@ -59,7 +59,7 @@ HEADERS =   qwaylandintegration.h \
 
 DEFINES += Q_PLATFORM_WAYLAND
 
-contains(config_test_xkbcommon,yes) {
+config_xkbcommon {
     !contains(QT_CONFIG, no-pkg-config) {
         PKGCONFIG += xkbcommon
     } else {

diff --git a/sync.profile b/sync.profile
index 7dd55e3..72c2201 100644 (file)
--- a/sync.profile
+++ b/sync.profile
@@ -21,9 +21,3 @@
         "qtjsbackend" => "refs/heads/master",
         "qtdeclarative" => "refs/heads/master",
 );
-
-# Compile tests
-%configtests = (
-    "xkbcommon" => {},
-    "brcm_egl" => {}
-);