diff options
| author | Andreas Holzammer <andreas.holzammer@kdab.com> | 2012-09-21 09:32:07 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-24 09:59:31 +0200 |
| commit | 16986c733e0cd1109a4e42cecd968bae37422f25 (patch) | |
| tree | 1bc526289580baf6ca76ee1d87f687bb2fe71e75 /src | |
| parent | 0eb50be9a42dfee533a376363a17eabebbcb8ccf (diff) | |
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>
Diffstat (limited to 'src')
| -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 |