diff options
| author | dt <qtc-committer@nokia.com> | 2009-04-16 17:13:11 +0200 |
|---|---|---|
| committer | dt <qtc-committer@nokia.com> | 2009-04-16 17:13:11 +0200 |
| commit | 55be2ea52f823a06e31319471fe51bd5ecdb688d (patch) | |
| tree | 2757b660cb22ad40e89641b245130b3cefa9f0b0 | |
| parent | dec4acdbf2c5f9013c2ab74ea6e28a6a72a2ed78 (diff) | |
| parent | ceca662ec5477ad53ea763636c05a2b0448f4c45 (diff) | |
Merge branch '1.1' of git@scm.dev.nokia.troll.no:creator/mainline into 1.1
| -rw-r--r-- | doc/qtcreator.qdoc | 7 | ||||
| -rw-r--r-- | src/plugins/debugger/gdboptionpage.ui | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index 4f31d54407..9ae007d3bd 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 baf91e4667..7c7c20b957 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> |