Commit e4796731 authored by hjk's avatar hjk
Browse files

compile fix

parent b09bdf08
...@@ -1271,6 +1271,7 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data) ...@@ -1271,6 +1271,7 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data)
if (isStoppedReason(reason) || reason.isEmpty()) { if (isStoppedReason(reason) || reason.isEmpty()) {
// Need another round trip // Need another round trip
if (reason == "breakpoint-hit") { if (reason == "breakpoint-hit") {
q->showStatusMessage(tr("Stopped at breakpoint."), -1);
GdbMi frame = data.findChild("frame"); GdbMi frame = data.findChild("frame");
//qDebug() << frame.toString(); //qDebug() << frame.toString();
m_currentFrame = frame.findChild("addr").data() + '%' + m_currentFrame = frame.findChild("addr").data() + '%' +
...@@ -1282,6 +1283,7 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data) ...@@ -1282,6 +1283,7 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data)
QVariant var = QVariant::fromValue<GdbMi>(data); QVariant var = QVariant::fromValue<GdbMi>(data);
sendCommand("p 0", GdbAsyncOutput2, var); // dummy sendCommand("p 0", GdbAsyncOutput2, var); // dummy
} else { } else {
q->showStatusMessage(tr("Stopped. %1").arg(reason), -1);
handleAsyncOutput2(data); handleAsyncOutput2(data);
} }
return; return;
......
...@@ -78,7 +78,7 @@ private: ...@@ -78,7 +78,7 @@ private:
void editItem(const QModelIndex &idx); void editItem(const QModelIndex &idx);
void reset(); /* reimpl */ void reset(); /* reimpl */
void modelResetHelper(const QModelIndex &idx); void resetHelper(const QModelIndex &idx);
bool m_alwaysResizeColumnsToContents; bool m_alwaysResizeColumnsToContents;
Type m_type; Type m_type;
......
...@@ -785,8 +785,13 @@ int main(int argc, char *argv[]) ...@@ -785,8 +785,13 @@ int main(int argc, char *argv[])
testVariant3(); testVariant3();
testVector(); testVector();
testVectorOfList(); testVectorOfList();
*(int *)0 = 0;
testObject(argc, argv); testObject(argc, argv);
//QColor color(255,128,10); //QColor color(255,128,10);
//QFont font; //QFont font;
......
Supports Markdown
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