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

src/plugins/debugger/gdbengine.cpp

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

src/plugins/projectexplorer/projectwizardpage.ui

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