From 4c44cffd7b376900fc41169365ae03c7c65d95b6 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 19 Aug 2016 09:07:18 +0200 Subject: Fix build after qtConfig changes in qtbase Change-Id: Ic345acc4e7cf08a0fd94c9e3a1fd2279cdd8a93e Reviewed-by: Oswald Buddenhagen --- examples/svg/opengl/framebufferobject/framebufferobject.pro | 2 +- examples/svg/opengl/opengl.pro | 2 +- examples/svg/svg.pro | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/svg/opengl/framebufferobject/framebufferobject.pro b/examples/svg/opengl/framebufferobject/framebufferobject.pro index dd3211f..d180d4d 100644 --- a/examples/svg/opengl/framebufferobject/framebufferobject.pro +++ b/examples/svg/opengl/framebufferobject/framebufferobject.pro @@ -1,4 +1,4 @@ -contains(QT_CONFIG, opengles2):error("This example is written for OpenGL 1.x") +qtConfig(opengles2):error("This example is written for OpenGL 1.x") QT += widgets opengl svg diff --git a/examples/svg/opengl/opengl.pro b/examples/svg/opengl/opengl.pro index 661015f..82c616c 100644 --- a/examples/svg/opengl/opengl.pro +++ b/examples/svg/opengl/opengl.pro @@ -1,2 +1,2 @@ TEMPLATE = subdirs -qtHaveModule(widgets):!contains(QT_CONFIG, opengles2):!contains(QT_CONFIG, dynamicgl): SUBDIRS += framebufferobject +qtHaveModule(widgets):!qtConfig(opengles2):!qtConfig(dynamicgl): SUBDIRS += framebufferobject diff --git a/examples/svg/svg.pro b/examples/svg/svg.pro index c828a95..410415b 100644 --- a/examples/svg/svg.pro +++ b/examples/svg/svg.pro @@ -3,4 +3,4 @@ TEMPLATE = subdirs qtHaveModule(widgets): SUBDIRS += embeddedsvgviewer svggenerator svgviewer SUBDIRS += embedded richtext draganddrop network -qtHaveModule(opengl):!contains(QT_CONFIG, opengles2): SUBDIRS += opengl +qtHaveModule(opengl):!qtConfig(opengles2): SUBDIRS += opengl -- cgit v1.2.1