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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidrunner.cpp
	src/plugins/projectexplorer/kitmanager.cpp

Change-Id: I653ddaef6e341818fc74aacfe30e89c07f40a8c6
This commit is contained in:
Oswald Buddenhagen
2013-01-16 16:42:56 +01:00
parent 72e3605a01 6ec9dd10a5
commit 65c169c80e
23 changed files with 299 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/Debugger.pluginspec.in
View File

@@ -24,9 +24,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<argumentList>
<argument name=\"-debug\" parameter=\"pid\">Attach to local process</argument>
<argument name=\"-debug\" parameter=\"executable\">Start and debug executable</argument>
<argument name=\"-debug [executable,]core=&lt;corefile&gt;[,sysroot=&lt;sysroot&gt;]\">
<argument name=\"-debug [executable,]core=&lt;corefile&gt;[,kit=&lt;kit&gt;]\">
Attach to core file</argument>
<argument name=\"-debug &lt;executable&gt;,server=&lt;server:port&gt;[,sysroot=&lt;sysroot&gt;][,arch=&lt;arch&gt;]\">
<argument name=\"-debug &lt;executable&gt;,server=&lt;server:port&gt;[,kit=&lt;kit&gt;]\">
Attach to remote debug server</argument>
<argument name=\"-wincrashevent\"
parameter=\"eventhandle:pid\">

3
src/plugins/debugger/gdb/classicgdbengine.cpp
View File

@@ -1276,6 +1276,9 @@ static void showQtDumperLibraryWarning(const QString &details)
"expand the Details section and click Build All."));
if (!details.isEmpty())
dialog.setDetailedText(details);
#if defined(Q_OS_MAC) && QT_VERSION >= 0x050000
dialog.setWindowModality(Qt::WindowModal);
#endif
dialog.exec();
if (dialog.clickedButton() == qtPref) {
Core::ICore::showOptionsDialog(