From: Andreas Holzammer <andreas.holzammer@kdab.com>
Date: Fri, 21 Sep 2012 07:32:07 +0000 (+0200)
Subject: Windows CE buildfix
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=16986c733e0cd1109a4e42cecd968bae37422f25;p=konrad%2Fqtdeclarative.git

Windows CE buildfix

Windows CE has a define for CONST,
so undef it.

Change-Id: I13d363657e91956c611dee4cf90cd17f6a0fa234
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---

diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index f88e17a..9a42523 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -2065,7 +2065,7 @@ bool QQml_isFileCaseCorrect(const QString &fileName)
     QFileInfo info(fileName);
     const QString absolute = info.absoluteFilePath();
 
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MAC) || defined(Q_OS_WINCE)
     const QString canonical = info.canonicalFilePath();
 #elif defined(Q_OS_WIN)
     wchar_t buffer[1024];
diff --git a/src/qml/qml/v4/qv4ir_p.h b/src/qml/qml/v4/qv4ir_p.h
index e8461ff..da7bb79 100644
--- a/src/qml/qml/v4/qv4ir_p.h
+++ b/src/qml/qml/v4/qv4ir_p.h
@@ -65,6 +65,10 @@
 
 // #define DEBUG_IR_STRUCTURE
 
+#ifdef CONST
+#  undef CONST
+#endif
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE