Merge commit 'origin/1.1'

Conflicts: src/plugins/debugger/debuggeractions.cpp src/plugins/debugger/gdboptionpage.ui
2009-04-17 15:17:31 +02:00
parent 2a1c503bc3 6f85959d06
commit 412a4b027d
24 changed files with 657 additions and 186 deletions
--- a/share/qtcreator/gdbmacros/gdbmacros.pro
+++ b/share/qtcreator/gdbmacros/gdbmacros.pro
@@ -1,3 +1,7 @@
 TEMPLATE = lib
 CONFIG += shared
+linux-* {
+CONFIG -= release
+CONFIG += debug
+}
 SOURCES=gdbmacros.cpp