feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta

Browse Source
This commit is contained in:
mae
2008-12-05 13:21:18 +01:00
parent 6d37029be8 5c6be3a83c
commit f2f9e8a831
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/gdbengine.cpp
View File

@@ -1276,7 +1276,7 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data)
m_currentFrame = frame.findChild("addr").data() + '%' + m_currentFrame = frame.findChild("addr").data() + '%' +
frame.findChild("func").data() + '%'; frame.findChild("func").data() + '%';
QApplication::alert(q->mainWindow(), 200); QApplication::alert(q->mainWindow(), 3000);
sendCommand("-file-list-exec-source-files", GdbQuerySources); sendCommand("-file-list-exec-source-files", GdbQuerySources);
sendCommand("-break-list", BreakList); sendCommand("-break-list", BreakList);
QVariant var = QVariant::fromValue<GdbMi>(data); QVariant var = QVariant::fromValue<GdbMi>(data);

5
src/plugins/projectexplorer/projectwizardpage.ui
View File

@@ -104,8 +104,9 @@
<widget class="QLabel" name="filesLabel"> <widget class="QLabel" name="filesLabel">
<property name="text"> <property name="text">
<string>The following files will be added: <string>The following files will be added:
f1
f2
</string> </string>
</property> </property>
<property name="textInteractionFlags"> <property name="textInteractionFlags">