diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-05 14:47:11 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 08:32:09 +0200 |
| commit | 5d7e56377d3330eb9afacd3bac95573a4c6f3716 (patch) | |
| tree | 57a4de38eb8390e76a9b7fa4e7a559553fc5fa0d | |
| parent | 0a35f98e2c120ec5253622e1f21982393e80b86e (diff) | |
switch to new-style configure tests
Change-Id: I70f4f4e81a042a977748dbb42b069b3706829828
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| -rw-r--r-- | qtwayland.pro | 4 | ||||
| -rw-r--r-- | src/compositor/hardware_integration/hardware_integration.pri | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/wayland/gl_integration/gl_integration.pri | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/wayland/wayland.pro | 2 | ||||
| -rw-r--r-- | sync.profile | 6 |
5 files changed, 7 insertions, 9 deletions
diff --git a/qtwayland.pro b/qtwayland.pro index 44d68b43a..4a8027519 100644 --- 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 0156c4907..372a1e1f0 100644 --- 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 e621c11e8..720f304bf 100644 --- 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 20598260a..c8673b92a 100644 --- 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 7dd55e3df..72c22011c 100644 --- a/sync.profile +++ b/sync.profile @@ -21,9 +21,3 @@ "qtjsbackend" => "refs/heads/master", "qtdeclarative" => "refs/heads/master", ); - -# Compile tests -%configtests = ( - "xkbcommon" => {}, - "brcm_egl" => {} -); |