diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 4f31d54407a..9ae007d3bd2 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -1571,8 +1571,11 @@
         \o Loading KDE4 designer plugins breaks the style in KDE < 4.2.1
            due to a bug in KDE.
 
-        \o Scopes in \c{.pro} files are ignored, and environment variables not
-           expanded.
+        \o The DEFINES and INCLUDES set in \c{.pro} files are not dealt with
+           on a file-specific level. Because of this, handling of DEFINES has
+           been disabled completely. Also the \c{.qmake.cache} is not being
+           parsed. In general, the \c{.pro} file parser is incomplete and
+           problems are still to be expected.
 
         \o Code completion for generated UI header files is updated only
            after a build.
diff --git a/src/plugins/debugger/gdboptionpage.ui b/src/plugins/debugger/gdboptionpage.ui
index baf91e4667d..7c7c20b957c 100644
--- a/src/plugins/debugger/gdboptionpage.ui
+++ b/src/plugins/debugger/gdboptionpage.ui
@@ -182,9 +182,6 @@
           <property name="layoutDirection">
            <enum>Qt::LeftToRight</enum>
           </property>
-          <property name="frame">
-           <bool>false</bool>
-          </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>