diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-04-16 12:06:42 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-04-16 12:06:42 +0100 |
| commit | c38ba06bbc139b1d070bf279bc9e05384ece1e87 (patch) | |
| tree | 85093824bba8fe333ca93e5184aca00e8e7f3220 /src/3rdparty | |
| parent | caeb69e2401fe4e8e4d7dfa34e39eee941478a9e (diff) | |
| parent | 78973b481c3cfb6db2511f0487d1045ad16a21eb (diff) | |
Merge branch '5.6' into 5.7
Conflicts:
examples/qt3d/examples-common/qorbitcontrol.h
src/core/qnodecreatedchange.cpp
src/core/qnodecreatedchange.h
src/input/frontend/qaxisactionhandler.h
src/input/frontend/qinputaspect.h
src/input/frontend/qkeyboardhandler.h
src/input/frontend/qmousedevice.h
src/input/frontend/qmousehandler.h
src/input/frontend/qphysicaldevicecreatedchange.h
src/input/input.pro
src/logic/qframeaction.h
src/plugins/sceneparsers/assimp/assimp.pro
src/quick3d/imports/input/importsinput.pro
src/quick3d/imports/render/importsrender.pro
src/render/backend/trianglesextractor.cpp
src/render/framegraph/qclearbuffer.h
src/render/framegraph/qlighting.h
src/render/framegraph/qstateset.h
src/render/frontend/qrenderattachment.h
src/render/geometry/qabstractattribute.h
src/render/geometry/qabstractbuffer.h
src/render/geometry/qattribute.h
src/render/geometry/qboundingvolumespecifier.h
src/render/geometry/qbuffer.h
src/render/materialsystem/qfilterkey.h
src/render/materialsystem/qparameter.h
src/render/materialsystem/qparametermapping.h
src/render/renderstates/qblendstate.h
src/render/renderstates/qdepthmask.h
src/render/renderstates/qpointsize.cpp
src/render/renderstates/qrenderstatecreatedchange.cpp
src/render/renderstates/qstencilop.h
src/render/renderstates/qstencilopseparate.h
src/render/renderstates/qstenciltestseparate.h
src/render/texture/qabstracttexture.h
src/render/texture/qabstracttextureimage.h
src/render/texture/qtextureproviders.h
Change-Id: I894d7781042cabdaa0cac690c198b57a41127bd4
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/assimp/assimp.pri | 15 | ||||
| -rw-r--r-- | src/3rdparty/assimp/code/BoostWorkaround/boost/tuple/tuple.hpp | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/3rdparty/assimp/assimp.pri b/src/3rdparty/assimp/assimp.pri index fa5206eac..ba0920833 100644 --- a/src/3rdparty/assimp/assimp.pri +++ b/src/3rdparty/assimp/assimp.pri @@ -19,18 +19,23 @@ contains(QT_CONFIG, system-zlib):!if(cross_compile:host_build) { DEFINES += ASSIMP_BUILD_NO_OWN_ZLIB ASSIMP_BUILD_NO_COMPRESSED_IFC ASSIMP_BUILD_NO_Q3BSP_IMPORTER -# Stop compiler complaining about ignored qualifiers on return types intel_icc: { + # warning #310: old-style parameter list (anachronism) + QMAKE_CFLAGS_WARN_ON += -wd310 + + # warning #68: integer conversion resulted in a change of sign + QMAKE_CFLAGS_WARN_ON += -wd68 + + # warning #858: type qualifier on return type is meaningless QMAKE_CFLAGS_WARN_ON += -wd858 + QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON -} gcc|clang: { +} else:gcc|clang: { + # Stop compiler complaining about ignored qualifiers on return types QMAKE_CFLAGS_WARN_ON += -Wno-ignored-qualifiers -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated-declarations -Wno-unused-function -Wno-reorder QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON } -# warning #310: old-style parameter list (anachronism) -intel_icc: QMAKE_CFLAGS_WARN_ON += -wd310 - CONFIG += warn_on VPATH += \ diff --git a/src/3rdparty/assimp/code/BoostWorkaround/boost/tuple/tuple.hpp b/src/3rdparty/assimp/code/BoostWorkaround/boost/tuple/tuple.hpp index 0ff61d9c3..3c1dd7b33 100644 --- a/src/3rdparty/assimp/code/BoostWorkaround/boost/tuple/tuple.hpp +++ b/src/3rdparty/assimp/code/BoostWorkaround/boost/tuple/tuple.hpp @@ -275,7 +275,7 @@ namespace boost { // Constructs a tuple with 0 elements (well ...) inline tuple <> make_tuple () { - tuple <> t; + tuple <> t = tuple <> (); return t; } }; |