qiurui
/
qt3d
mirror of https://github.com/qt/qt3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjust to qtConfig() changes in qtbase 

Change-Id: Ic5b9447ef9ba54124553775b973d616af22b7032
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Liang Qi 2016-08-20 17:22:08 +02:00 committed by Lars Knoll
parent 9a18925b63
commit 47f3704afc
15 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.tests/assimp/assimp.pro
View File

@ -1,6 +1,6 @@
SOURCES += main.cpp
unix:!contains(QT_CONFIG, no-pkg-config) {
unix:qtConfig(pkg-config) {
CONFIG += link_pkgconfig
PKGCONFIG += assimp
} else {

2
qt3d.pro
View File

@ -1,4 +1,4 @@
requires(contains(QT_CONFIG, opengl))
requires(qtConfig(opengl))
load(configure)
qtCompileTest(assimp)

8
src/3rdparty/assimp/assimp.pri vendored
View File

@ -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

2
src/3rdparty/assimp/assimp_dependency.pri vendored
View File

@ -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 {

2
src/core/core.pro
View File

@ -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)

2
src/quick3d/quick3d/quick3d.pro
View File

@ -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

2
src/quick3d/quick3dextras/quick3dextras.pro
View File

@ -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

2
src/quick3d/quick3dinput/quick3dinput.pro
View File

@ -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

2
src/quick3d/quick3drender/quick3drender.pro
View File

@ -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

2
src/render/render.pro
View File

@ -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

2
tests/auto/core/core.pro
View File

@ -14,7 +14,7 @@ SUBDIRS = \
qscene \
qservicelocator
contains(QT_CONFIG, private_tests) {
qtConfig(private_tests) {
SUBDIRS += \
qentity \
qframeallocator \

2
tests/auto/input/input.pro
View File

@ -1,6 +1,6 @@
TEMPLATE = subdirs
contains(QT_CONFIG, private_tests) {
qtConfig(private_tests) {
SUBDIRS += \
qaxis \
qaction \

2
tests/auto/quick3d/quick3d.pro
View File

@ -1,6 +1,6 @@
TEMPLATE = subdirs
contains(QT_CONFIG, private_tests) {
qtConfig(private_tests) {
SUBDIRS += \
quick3dnodeinstantiator \
dynamicnodecreation

2
tests/auto/render/render.pro
View File

@ -1,6 +1,6 @@
TEMPLATE = subdirs
contains(QT_CONFIG, private_tests) {
qtConfig(private_tests) {
SUBDIRS += \
entity \
renderqueue \

2
tests/benchmarks/render/render.pro
View File

@ -1,5 +1,5 @@
TEMPLATE=subdirs
contains(QT_CONFIG, private_tests) {
qtConfig(private_tests) {
SUBDIRS += jobs
}