summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-08-12 07:32:54 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-08-12 07:39:26 (GMT)
commit7a9c6609630ad22109a67c9d504a6458080988b9 (patch)
tree103838dca3440f411f077ad36aa2082e266753ba
parent9ac204ab8a6042ee95f5d6e13c3819b584c14fd7 (diff)
downloadQt-7a9c6609630ad22109a67c9d504a6458080988b9.zip
Qt-7a9c6609630ad22109a67c9d504a6458080988b9.tar.gz
Qt-7a9c6609630ad22109a67c9d504a6458080988b9.tar.bz2
Fix compilation on 64-bit machines.
On 64-bit machines the construction of QVariant from intptr_t is ambigious as it could be void* or ulonglong. The documentation for the debugger extension on the other hand is clear that it should be a qint64. An explicit construction of a qint64 fixes it. Reviewed-by: Jedrzej Nowacki <jedrzej.nowacki@nokia.com>
-rw-r--r--src/script/api/qscriptengineagent_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/api/qscriptengineagent_p.h b/src/script/api/qscriptengineagent_p.h
index da3eef5..20b4925 100644
--- a/src/script/api/qscriptengineagent_p.h
+++ b/src/script/api/qscriptengineagent_p.h
@@ -114,7 +114,7 @@ public:
virtual void didReachBreakpoint(const JSC::DebuggerCallFrame&, intptr_t sourceID, int lineno, int column)
{
QList<QVariant> args;
- args << sourceID << lineno << column;
+ args << qint64(sourceID) << lineno << column;
if (q_ptr->supportsExtension(QScriptEngineAgent::DebuggerInvocationRequest))
q_ptr->extension(QScriptEngineAgent::DebuggerInvocationRequest, args);
};