Merge branch '1.1'

2009-04-18 01:04:01 +02:00
parent 193af69a38 87f74b4eea
commit 035e1eb4fe
7 changed files with 22 additions and 16 deletions
--- a/src/plugins/debugger/dumper.pro
+++ b/src/plugins/debugger/dumper.pro
@@ -5,5 +5,10 @@ CONFIG += shared
 DESTDIR  = ../../../bin
 include(../../qworkbenchlibrary.pri)

+linux-* {
+CONFIG -= release
+CONFIG += debug
+}
+
 SOURCES += ../../../share/qtcreator/gdbmacros/gdbmacros.cpp

--- a/src/plugins/texteditor/basetextdocument.cpp
+++ b/src/plugins/texteditor/basetextdocument.cpp