diff options
| author | Morten Sørvig <msorvig@trolltech.com> | 2009-06-16 11:20:15 (GMT) |
|---|---|---|
| committer | Morten Sørvig <msorvig@trolltech.com> | 2009-06-16 11:20:15 (GMT) |
| commit | c41591d57377cd7c520efc93d9c087ad34d2bb6f (patch) | |
| tree | 975a8573da68b3f9bd169ecf607f7492f723a003 /src/scripttools/debugging/qscriptenginedebugger.cpp | |
| parent | 1e6b142fa2833f55972d6d4aa7dde0bb215c2f25 (diff) | |
| parent | acc764552c552df31719af561e285886085371e9 (diff) | |
| download | Qt-c41591d57377cd7c520efc93d9c087ad34d2bb6f.zip Qt-c41591d57377cd7c520efc93d9c087ad34d2bb6f.tar.gz Qt-c41591d57377cd7c520efc93d9c087ad34d2bb6f.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/scripttools/debugging/qscriptenginedebugger.cpp')
| -rw-r--r-- | src/scripttools/debugging/qscriptenginedebugger.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/scripttools/debugging/qscriptenginedebugger.cpp b/src/scripttools/debugging/qscriptenginedebugger.cpp index 6ee6c98..b09c79a 100644 --- a/src/scripttools/debugging/qscriptenginedebugger.cpp +++ b/src/scripttools/debugging/qscriptenginedebugger.cpp @@ -410,7 +410,7 @@ QWidget *QScriptEngineDebugger::widget(DebuggerWidget widget) const { Q_D(const QScriptEngineDebugger); const_cast<QScriptEngineDebuggerPrivate*>(d)->createDebugger(); - return d->debugger->widget(static_cast<QScriptDebugger::DebuggerWidget>(widget)); + return d->debugger->widget(static_cast<QScriptDebugger::DebuggerWidget>(static_cast<int>(widget))); } /*! @@ -434,7 +434,7 @@ QAction *QScriptEngineDebugger::action(DebuggerAction action) const Q_D(const QScriptEngineDebugger); QScriptEngineDebugger *that = const_cast<QScriptEngineDebugger*>(this); that->d_func()->createDebugger(); - return d->debugger->action(static_cast<QScriptDebugger::DebuggerAction>(action), that); + return d->debugger->action(static_cast<QScriptDebugger::DebuggerAction>(static_cast<int>(action)), that); } /*! |