diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-05-28 22:18:54 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-28 22:24:44 +0200 |
| commit | eeb43b3aff1ae100bbe31f4892fe5a8cec8a3a86 (patch) | |
| tree | 3e561efe0d5ce1f7e7cfd7d6ca4ee7619a297020 /src/qml/qml | |
| parent | 00a07bcbd7a592072822b0e55ab2e75e90c3f9f5 (diff) | |
Fix compilation on linux and clang
Change-Id: I49b71ca6f48b849db9c8bbc1fd8a0687a0a05bb1
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/v4/qv4function.cpp | 6 | ||||
| -rw-r--r-- | src/qml/qml/v4/v4.pri | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/qml/v4/qv4function.cpp b/src/qml/qml/v4/qv4function.cpp index 86d0528783..bded5fbf8c 100644 --- a/src/qml/qml/v4/qv4function.cpp +++ b/src/qml/qml/v4/qv4function.cpp @@ -66,18 +66,16 @@ void Function::mark() identifiers.at(i)->mark(); } -namespace { - +namespace QV4 { bool operator<(const LineNumberMapping &mapping, quintptr pc) { return mapping.codeOffset < pc; } - } int Function::lineNumberForProgramCounter(quintptr pc) const { - quint32 offset = pc - reinterpret_cast<quintptr>(code); + quintptr offset = pc - reinterpret_cast<quintptr>(code); QVector<LineNumberMapping>::ConstIterator it = qLowerBound(lineNumberMappings.begin(), lineNumberMappings.end(), offset); if (it != lineNumberMappings.constBegin() && lineNumberMappings.count() > 0) --it; diff --git a/src/qml/qml/v4/v4.pri b/src/qml/qml/v4/v4.pri index 363133a90b..b392960d88 100644 --- a/src/qml/qml/v4/v4.pri +++ b/src/qml/qml/v4/v4.pri @@ -185,7 +185,9 @@ valgrind { ios: DEFINES += ENABLE_ASSEMBLER_WX_EXCLUSIVE=1 -LIBS_PRIVATE += -lDbgHelp +win32 { + LIBS_PRIVATE += -lDbgHelp +} include(moth/moth.pri) include(../../../3rdparty/masm/masm.pri) |