diff options
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/v4/qv4ir_p.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index f88e17a834..9a425234c0 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 e8461ff0fc..da7bb79f67 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 |