From: Ivailo Monev <xakepa10@gmail.com>
Date: Fri, 24 Jun 2016 10:52:11 +0000 (+0300)
Subject: some bootstrap fixes for MSVC
X-Git-Tag: 4.12.0~7155
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=36229d5039d3d8427e1ff65b44c2a214a02e802b;p=kde%2FKatie.git

some bootstrap fixes for MSVC

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---

diff --git a/src/core/kernel/qmetatype.cpp b/src/core/kernel/qmetatype.cpp
index 39bf501a6..06048042d 100644
--- a/src/core/kernel/qmetatype.cpp
+++ b/src/core/kernel/qmetatype.cpp
@@ -48,7 +48,9 @@
 #include "qstringlist.h"
 #include "qvector.h"
 #include "qlocale.h"
+#ifndef QT_BOOTSTRAPPED
 #include "qeasingcurve.h"
+#endif
 
 #ifdef QT_BOOTSTRAPPED
 # ifndef QT_NO_GEOM_VARIANT
diff --git a/src/core/kernel/qvariant.cpp b/src/core/kernel/qvariant.cpp
index fce2b89f4..8d45019c1 100644
--- a/src/core/kernel/qvariant.cpp
+++ b/src/core/kernel/qvariant.cpp
@@ -46,7 +46,9 @@
 #include "qdebug.h"
 #include "qmap.h"
 #include "qdatetime.h"
+#ifndef QT_BOOTSTRAPPED
 #include "qeasingcurve.h"
+#endif
 #include "qlist.h"
 #include "qstring.h"
 #include "qstringlist.h"
diff --git a/src/core/tools/qbytearray.cpp b/src/core/tools/qbytearray.cpp
index 92fc2e5ab..60db3febe 100644
--- a/src/core/tools/qbytearray.cpp
+++ b/src/core/tools/qbytearray.cpp
@@ -47,7 +47,7 @@
 #include "qlocale.h"
 #include "qlocale_p.h"
 #include "qscopedpointer.h"
-#include <qdatastream.h>
+#include "qdatastream.h"
 
 #ifndef QT_NO_COMPRESS
 #include <zlib.h>
diff --git a/src/core/tools/qlocale.h b/src/core/tools/qlocale.h
index e6f17c4f1..f10e27232 100644
--- a/src/core/tools/qlocale.h
+++ b/src/core/tools/qlocale.h
@@ -124,7 +124,7 @@ private:
     QSystemLocale(bool);
     friend QSystemLocale *QSystemLocale_globalSystemLocale();
 };
-#endif
+#endif // QT_NO_SYSTEMLOCALE
 
 struct QLocalePrivate;
 class Q_CORE_EXPORT QLocale