diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-08-19 09:07:18 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-19 07:20:45 +0000 |
| commit | 4c44cffd7b376900fc41169365ae03c7c65d95b6 (patch) | |
| tree | 8b988662a0f39ddc5a67fbfee12ab58aff20b80a | |
| parent | 20db91a6d71c20cc000f28ecc67c220d9badfd3e (diff) | |
| download | qtsvg-4c44cffd7b376900fc41169365ae03c7c65d95b6.tar.gz | |
Fix build after qtConfig changes in qtbasev5.8.0-alpha1
Change-Id: Ic345acc4e7cf08a0fd94c9e3a1fd2279cdd8a93e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| -rw-r--r-- | examples/svg/opengl/framebufferobject/framebufferobject.pro | 2 | ||||
| -rw-r--r-- | examples/svg/opengl/opengl.pro | 2 | ||||
| -rw-r--r-- | examples/svg/svg.pro | 2 | ||||
| -rw-r--r-- | src/svg/svg.pro | 11 |
4 files changed, 6 insertions, 11 deletions
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 diff --git a/src/svg/svg.pro b/src/svg/svg.pro index ce5bf1a..f9e43b0 100644 --- a/src/svg/svg.pro +++ b/src/svg/svg.pro @@ -36,14 +36,9 @@ SOURCES += \ qgraphicssvgitem.cpp \ qsvggenerator.cpp -contains(QT_CONFIG, system-zlib) { - if(unix|mingw): LIBS_PRIVATE += -lz - else { - isEmpty(ZLIB_LIBS): LIBS += zdll.lib - else: LIBS += $$ZLIB_LIBS - } -} else { +qtConfig(system-zlib): \ + QMAKE_USE_PRIVATE += zlib +else: \ QT_PRIVATE += zlib-private -} load(qt_module) |