summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Funk <kfunk@kde.org>2017-03-02 12:51:22 +0100
committerSean Harmer <sean.harmer@kdab.com>2017-03-02 13:04:22 +0000
commit7c59817810e74269a48b9f522a4b2013b426d3c2 (patch)
treea8834b4f68bec048c25cc29871b4c37348247a81
parent0e6f59aed2a79cf54505070ad7757527c8a04993 (diff)
assimp: Don't use -Wno-reorder on C compiler
Fixes warning: cc1: warning: command line option "-Wno-reorder" is valid for C++/ObjC++ but not for C Change-Id: I0892d07ec15d40a361b728fd05dcf0234b69292f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--src/3rdparty/assimp/assimp.pri4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/assimp/assimp.pri b/src/3rdparty/assimp/assimp.pri
index d3282fb56..985f491a4 100644
--- a/src/3rdparty/assimp/assimp.pri
+++ b/src/3rdparty/assimp/assimp.pri
@@ -30,8 +30,8 @@ intel_icc: {
QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
} 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
+ QMAKE_CFLAGS_WARN_ON += -Wno-ignored-qualifiers -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated-declarations -Wno-unused-function
+ QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -Wno-reorder
} else:msvc {
# Disabled Warnings:
# 4100: 'identifier' : unreferenced formal parameter