summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPasi Keranen <pasi.keranen@qt.io>2018-08-30 13:12:39 +0300
committerPasi Keränen <pasi.keranen@qt.io>2018-08-31 05:50:57 +0000
commiteb8ef6eef23b5f0a2fae9e56594ef23b9d477d0a (patch)
treebb2a61e67a12f03cbec30e08a30894abaacbd098 /src
parentcd41d29435972db4a293fe7495a6816355b2e182 (diff)
Suppress warnings from 3rd party library code with clang
Updates ColladaDOM and PCRE submodules. Reduces number of total warnings from 26376 to 6593. Building 3rdparty project still produces 8 "file has no symbols" warnings that are not fixable at the moment due to QTCREATORBUG-13111. Remaining issues are issues in Qt 3D Studio code. Task-number: QT3DS-479 Change-Id: I83d8bf7d26aae46264a4495f76ab807627f95a37 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
Diffstat (limited to 'src')
m---------src/3rdparty/ColladaDOM0
m---------src/3rdparty/pcre0
-rw-r--r--src/Authoring/Common/Code/Qt3DSDAE.h57
-rw-r--r--src/Authoring/Common/Code/Qt3DSFBXSDK.h49
-rw-r--r--src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportColladaSGTranslation.cpp9
-rw-r--r--src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportFbxSGTranslation.cpp2
6 files changed, 108 insertions, 9 deletions
diff --git a/src/3rdparty/ColladaDOM b/src/3rdparty/ColladaDOM
-Subproject faed1c2e4121a244938ab691bdbb0adb9f4bb85
+Subproject 1c3fbdcb5048312e5806a86ba310ac2c1935fc3
diff --git a/src/3rdparty/pcre b/src/3rdparty/pcre
-Subproject d654e6661494af090b636c66bac7db8fa055d45
+Subproject 26aa6b0ca74bc0fc355963cc582c47289f5d889
diff --git a/src/Authoring/Common/Code/Qt3DSDAE.h b/src/Authoring/Common/Code/Qt3DSDAE.h
new file mode 100644
index 00000000..8885a804
--- /dev/null
+++ b/src/Authoring/Common/Code/Qt3DSDAE.h
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt 3D Studio.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QT3DSDAE_H
+#define QT3DSDAE_H
+
+// Disable warnings from 3rd party code
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wheader-guard"
+#pragma clang diagnostic ignored "-Wnull-conversion"
+#pragma clang diagnostic ignored "-Woverloaded-virtual"
+#pragma clang diagnostic ignored "-Wunused-function"
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif // __clang__
+
+#include "dae.h"
+#include "dom/domCOLLADA.h"
+#include "dom/domConstants.h"
+#include "dom/domCommon_float_or_param_type.h"
+#include "dom/domCommon_transparent_type.h"
+#include "dom/domElements.h"
+#include "dom/domProfile_COMMON.h"
+#include "dom/domCommon_color_or_texture_type.h"
+
+// Re-enable warnings
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif // __clang__
+
+#endif // QT3DSDAE_H
diff --git a/src/Authoring/Common/Code/Qt3DSFBXSDK.h b/src/Authoring/Common/Code/Qt3DSFBXSDK.h
new file mode 100644
index 00000000..35c9096a
--- /dev/null
+++ b/src/Authoring/Common/Code/Qt3DSFBXSDK.h
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt 3D Studio.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QT3DSFBXSDK_H
+#define QT3DSFBXSDK_H
+
+// Disable warnings from 3rd party code
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wignored-qualifiers"
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wnull-dereference"
+#pragma clang diagnostic ignored "-Wmissing-field-initializers"
+
+#endif // __clang__
+
+#include <fbxsdk.h>
+
+// Re-enable warnings
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif // __clang__
+
+#endif // QT3DSFBXSDK_H
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportColladaSGTranslation.cpp b/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportColladaSGTranslation.cpp
index d1588fcd..0fc889bf 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportColladaSGTranslation.cpp
+++ b/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportColladaSGTranslation.cpp
@@ -28,11 +28,7 @@
****************************************************************************/
#include "Qt3DSCommonPrecompile.h"
-#include "dae.h"
-#include "dom/domCOLLADA.h"
-#include "dom/domConstants.h"
-#include "dom/domCommon_float_or_param_type.h"
-#include "dom/domCommon_transparent_type.h"
+#include "Qt3DSDAE.h"
#include "Qt3DSMath.h"
#include "Qt3DSImportColladaDOMUtils.h"
#include "Qt3DSImportColladaTransformUtils.h"
@@ -41,9 +37,6 @@
#include <memory>
#include <map>
#include <functional>
-#include "dom/domElements.h"
-#include "dom/domProfile_COMMON.h"
-#include "dom/domCommon_color_or_texture_type.h"
#include "Qt3DSImportTranslationCommon.h"
#include "Qt3DSImportSceneGraphTranslation.h"
#include "Qt3DSImportTranslation.h"
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportFbxSGTranslation.cpp b/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportFbxSGTranslation.cpp
index 3ac0bfec..208b555e 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportFbxSGTranslation.cpp
+++ b/src/Authoring/QT3DSIMP/Qt3DSImportSGTranslation/Qt3DSImportFbxSGTranslation.cpp
@@ -38,7 +38,7 @@
#include <tuple>
#include <memory>
#include <map>
-#include <fbxsdk.h>
+#include "Qt3DSFBXSDK.h"
#include "Qt3DSImportFbxDomUtils.h"
#include "Qt3DSImportSceneGraphTranslation.h"
#include "foundation/Qt3DSVec3.h"