summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2018-06-11 14:17:53 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2018-06-12 07:58:05 +0000
commit4cdfa2bd8d3ef8cf3305a4d26624bd141e46f884 (patch)
treee64e264e82c525200856d2dd417da2e5df9f2165 /src/3rdparty
parent992fe137b7d633803d05a906b0df3beaa65b3c2f (diff)
Consolidate stdafx headers into Qt3DSCommonPrecompile.h
Task-number: QT3DS-256 Change-Id: I1ab44e93bf505f68690114f2a2c5f1a012e02af1 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/color/CColor.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/3rdparty/color/CColor.cpp b/src/3rdparty/color/CColor.cpp
index 63c5bf13..d21cc945 100644
--- a/src/3rdparty/color/CColor.cpp
+++ b/src/3rdparty/color/CColor.cpp
@@ -10,11 +10,8 @@ Hinweis: (c) 1999 by Christian Rodemeyer
- MSDN: 'HLS Color Spaces'
- MSDN: 'Converting Colors Between RGB and HLS'
\****************************************************************************/
-#include "stdafx.h"
-
+#include "Qt3DSCommonPrecompile.h"
#include "CColor.h"
-#include <math.h>
-#include <assert.h>
float GetMin( float in1, float in2 );
float GetMin( float in1, float in2 )