Commit 3cee7dad authored by hjk's avatar hjk

debugger: make parts of python debugger work again with the new states

parent 97775d9c
This diff is collapsed.
This diff is collapsed.
......@@ -105,6 +105,9 @@ private:
bool isSynchroneous() const { return true; }
void updateWatchData(const WatchData &data);
signals:
void outputReady(const QByteArray &data);
private:
QString errorMessage(QProcess::ProcessError error) const;
unsigned debuggerCapabilities() const;
......@@ -113,10 +116,14 @@ private:
Q_SLOT void handlePdbError(QProcess::ProcessError error);
Q_SLOT void readPdbStandardOutput();
Q_SLOT void readPdbStandardError();
Q_SLOT void handleOutput2(const QByteArray &data);
void handleResponse(const QByteArray &ba);
void handleOutput(const QByteArray &data);
void updateAll();
void updateLocals();
void handleUpdateAll(const PdbResponse &response);
void handleFirstCommand(const PdbResponse &response);
void handleExecuteDebuggerCommand(const PdbResponse &response);
typedef void (PdbEngine::*PdbCommandCallback)
(const PdbResponse &response);
......@@ -139,7 +146,6 @@ private:
void handleListLocals(const PdbResponse &response);
void handleListModules(const PdbResponse &response);
void handleListSymbols(const PdbResponse &response);
void handleLoadDumper(const PdbResponse &response);
void handleBreakInsert(const PdbResponse &response);
void handleChildren(const WatchData &data0, const GdbMi &item,
......@@ -149,6 +155,7 @@ private:
PdbCommandCallback callback = 0,
const char *callbackName = 0,
const QVariant &cookie = QVariant());
void postDirectCommand(const QByteArray &command);
QQueue<PdbCommand> m_commands;
......
......@@ -327,7 +327,8 @@ void ScriptEngine::importExtensions()
"Make sure that the bindings have been built, "
"and that this executable and the plugins are "
"using compatible Qt libraries.",
qPrintable(failExtensions.join(QLatin1String(", "))), qPrintable(dir.absolutePath()));
qPrintable(failExtensions.join(QLatin1String(", "))),
qPrintable(dir.absolutePath()));
}
}
return; // failExtensions.isEmpty();
......@@ -336,12 +337,12 @@ void ScriptEngine::importExtensions()
void ScriptEngine::runEngine()
{
QTC_ASSERT(state() == EngineRunRequested, qDebug() << state());
SDEBUG("ScriptEngine::runEngine()");
notifyEngineRunAndInferiorRunOk();
showStatusMessage(tr("Running requested..."), 5000);
showMessage(QLatin1String("Running: ") + m_scriptFileName, LogMisc);
importExtensions();
const QScriptValue result = m_scriptEngine->evaluate(m_scriptContents, m_scriptFileName);
const QScriptValue result =
m_scriptEngine->evaluate(m_scriptContents, m_scriptFileName);
QString msg;
if (m_scriptEngine->hasUncaughtException()) {
msg = _("An exception occurred during execution at line: %1\n%2\n")
......
......@@ -46,8 +46,8 @@ def testMath():
print cube(5)
def main():
#testMath()
testApp()
testMath()
#testApp()
return 0
if __name__ == '__main__':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment