diff options
| -rw-r--r-- | config.tests/assimp/assimp.pro | 2 | ||||
| -rw-r--r-- | qt3d.pro | 2 | ||||
| -rw-r--r-- | src/3rdparty/assimp/assimp.pri | 8 | ||||
| -rw-r--r-- | src/3rdparty/assimp/assimp_dependency.pri | 2 | ||||
| -rw-r--r-- | src/core/core.pro | 2 | ||||
| -rw-r--r-- | src/quick3d/quick3d/quick3d.pro | 2 | ||||
| -rw-r--r-- | src/quick3d/quick3dextras/quick3dextras.pro | 2 | ||||
| -rw-r--r-- | src/quick3d/quick3dinput/quick3dinput.pro | 2 | ||||
| -rw-r--r-- | src/quick3d/quick3drender/quick3drender.pro | 2 | ||||
| -rw-r--r-- | src/render/render.pro | 2 | ||||
| -rw-r--r-- | tests/auto/core/core.pro | 2 | ||||
| -rw-r--r-- | tests/auto/input/input.pro | 2 | ||||
| -rw-r--r-- | tests/auto/quick3d/quick3d.pro | 2 | ||||
| -rw-r--r-- | tests/auto/render/render.pro | 2 | ||||
| -rw-r--r-- | tests/benchmarks/render/render.pro | 2 |
15 files changed, 11 insertions, 25 deletions
diff --git a/config.tests/assimp/assimp.pro b/config.tests/assimp/assimp.pro index 920c451c4..712986c17 100644 --- 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 { @@ -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 index ad72816d8..d3282fb56 100644 --- 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 index 4fe0df54e..f1a109f10 100644 --- 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 index 02cd8cc80..d7205f08a 100644 --- 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 index affb3b352..fc3ef19ee 100644 --- 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 index 489200a0c..e0e339e8a 100644 --- 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 index 3aa0dedcf..661a7f792 100644 --- 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 index 959834870..3079bc494 100644 --- 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 index b3c5fa1ad..267664220 100644 --- 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 index d8c4395a9..339e9d5a4 100644 --- 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 index 56be4b576..fa447730d 100644 --- 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 index 782e68500..ea7dd7c58 100644 --- 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 index d64a5e4e9..8f58a29b8 100644 --- 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 index c553199e3..f1095a347 100644 --- 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 } |