summaryrefslogtreecommitdiffstats
path: root/src/Authoring/QT3DSDM/Systems
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2018-07-06 13:46:31 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2018-07-06 12:47:04 +0000
commit927ba6e8e93b6bc5bff143222a55f7ec9577cd46 (patch)
tree25bc763b8cfccaa6a50fffae37d257fb8fb581b2 /src/Authoring/QT3DSDM/Systems
parent1f1cec2dbdd9da2aa3866f5f7ed2100582d3b29d (diff)
Fix bunch of compiler warnings
Change-Id: Ie383f6f72be3d2948fbd03a44ac4a48b1cc58302 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/QT3DSDM/Systems')
-rw-r--r--src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.cpp4
-rw-r--r--src/Authoring/QT3DSDM/Systems/Qt3DSDMHandles.cpp33
2 files changed, 4 insertions, 33 deletions
diff --git a/src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.cpp b/src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.cpp
index 38f08e11..c15854f1 100644
--- a/src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.cpp
+++ b/src/Authoring/QT3DSDM/Systems/Cores/SimpleAnimationCore.cpp
@@ -29,6 +29,10 @@
#include "Qt3DSDMPrefix.h"
#include "SimpleAnimationCore.h"
+#ifdef _WIN32
+#pragma warning(disable : 4503) // decorated name length exceeded
+#endif
+
typedef long INT32;
typedef float FLOAT;
#define DATALOGGER_CUBICROOT 0
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMHandles.cpp b/src/Authoring/QT3DSDM/Systems/Qt3DSDMHandles.cpp
deleted file mode 100644
index 703424ba..00000000
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMHandles.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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$
-**
-****************************************************************************/
-
-#include "Qt3DSDMPrefix.h"
-#include "Qt3DSDMHandles.h"
-
-namespace qt3dsdm {
-}