Adjust to qtConfig() changes in qtbase

Change-Id: Ic5b9447ef9ba54124553775b973d616af22b7032 Reviewed-by: Lars Knoll <[email protected]>
dignakov · Aug 21, 2016 · 47f3704 · 47f3704
1 parent 9a18925
commit 47f3704
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 25 deletions.
diff --git a/config.tests/assimp/assimp.pro b/config.tests/assimp/assimp.pro
@@ -1,6 +1,6 @@
 SOURCES += main.cpp
 
-unix:!contains(QT_CONFIG, no-pkg-config) {
+unix:qtConfig(pkg-config) {
     CONFIG += link_pkgconfig
     PKGCONFIG += assimp
 } else {

diff --git a/qt3d.pro b/qt3d.pro
@@ -1,4 +1,4 @@
-requires(contains(QT_CONFIG, opengl))
+requires(qtConfig(opengl))
 
 load(configure)
 qtCompileTest(assimp)

diff --git a/src/3rdparty/assimp/assimp.pri b/src/3rdparty/assimp/assimp.pri
@@ -10,12 +10,10 @@ CONFIG -= precompile_header
 
 win32:DEFINES+=_CRT_SECURE_NO_WARNINGS
 
-contains(QT_CONFIG, system-zlib):!if(cross_compile:host_build) {
-    if (unix|mingw):         LIBS += -lz
-    else:                    LIBS += zdll.lib
-} else {
+qtConfig(system-zlib):!if(cross_compile:host_build): \
+    QMAKE_USE_PRIVATE += zlib
+else: \
     QT_PRIVATE += zlib-private
-}
 
 DEFINES += ASSIMP_BUILD_NO_OWN_ZLIB ASSIMP_BUILD_NO_COMPRESSED_IFC ASSIMP_BUILD_NO_Q3BSP_IMPORTER
 

diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri
@@ -1,5 +1,5 @@
 config_assimp:!if(cross_compile:host_build) {
-    unix:!contains(QT_CONFIG, no-pkg-config) {
+    unix:qtConfig(pkg-config) {
         CONFIG += link_pkgconfig
         PKGCONFIG_PRIVATE += assimp
     } else {

diff --git a/src/core/core.pro b/src/core/core.pro
@@ -24,6 +24,4 @@ include(transforms/transforms.pri)
 include(resources/resources.pri)
 include(services/services.pri)
 
-!contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL
-
 load(qt_module)
diff --git a/src/quick3d/quick3d/quick3d.pro b/src/quick3d/quick3d/quick3d.pro
@@ -28,8 +28,6 @@ SOURCES += \
     qqmlaspectengine.cpp \
     qquaternionanimation.cpp
 
-!contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL
-
 # otherwise mingw headers do not declare common functions like ::strcasecmp
 win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x
 

diff --git a/src/quick3d/quick3dextras/quick3dextras.pro b/src/quick3d/quick3dextras/quick3dextras.pro
@@ -21,8 +21,6 @@ HEADERS += \
     qt3dquickextras_global.h \
     qt3dquickwindow.h
 
-!contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL
-
 # otherwise mingw headers do not declare common functions like ::strcasecmp
 win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x
 

diff --git a/src/quick3d/quick3dinput/quick3dinput.pro b/src/quick3d/quick3dinput/quick3dinput.pro
@@ -23,8 +23,6 @@ HEADERS += \
     qt3dquickinput_global.h \
     qt3dquickinputnodefactory_p.h
 
-!contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL
-
 # otherwise mingw headers do not declare common functions like ::strcasecmp
 win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x
 

diff --git a/src/quick3d/quick3drender/quick3drender.pro b/src/quick3d/quick3drender/quick3drender.pro
@@ -22,8 +22,6 @@ HEADERS += \
     qt3dquickrender_global_p.h \
     qt3dquickrender_global.h
 
-!contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL
-
 # otherwise mingw headers do not declare common functions like ::strcasecmp
 win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x
 

diff --git a/src/render/render.pro b/src/render/render.pro
@@ -34,8 +34,6 @@ HEADERS += \
     qt3drender_global.h \
     qt3drender_global_p.h
 
-!contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL
-
 # otherwise mingw headers do not declare common functions like ::strcasecmp
 win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x
 

diff --git a/tests/auto/core/core.pro b/tests/auto/core/core.pro
@@ -14,7 +14,7 @@ SUBDIRS = \
     qscene \
     qservicelocator
 
-contains(QT_CONFIG, private_tests) {
+qtConfig(private_tests) {
     SUBDIRS += \
     qentity \
     qframeallocator \

diff --git a/tests/auto/input/input.pro b/tests/auto/input/input.pro
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-contains(QT_CONFIG, private_tests) {
+qtConfig(private_tests) {
     SUBDIRS += \
         qaxis \
         qaction \

diff --git a/tests/auto/quick3d/quick3d.pro b/tests/auto/quick3d/quick3d.pro
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-contains(QT_CONFIG, private_tests) {
+qtConfig(private_tests) {
     SUBDIRS += \
         quick3dnodeinstantiator \
         dynamicnodecreation

diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-contains(QT_CONFIG, private_tests) {
+qtConfig(private_tests) {
     SUBDIRS += \
         entity \
         renderqueue \

diff --git a/tests/benchmarks/render/render.pro b/tests/benchmarks/render/render.pro
@@ -1,5 +1,5 @@
 TEMPLATE=subdirs
 
-contains(QT_CONFIG, private_tests) {
+qtConfig(private_tests) {
     SUBDIRS += jobs
 }