diff options
| -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) |