Commit 55be2ea5 authored by dt's avatar dt
Browse files

Merge branch '1.1' of git@scm.dev.nokia.troll.no:creator/mainline into 1.1

parents dec4acdb ceca662e
...@@ -1571,8 +1571,11 @@ ...@@ -1571,8 +1571,11 @@
\o Loading KDE4 designer plugins breaks the style in KDE < 4.2.1 \o Loading KDE4 designer plugins breaks the style in KDE < 4.2.1
due to a bug in KDE. due to a bug in KDE.
\o Scopes in \c{.pro} files are ignored, and environment variables not \o The DEFINES and INCLUDES set in \c{.pro} files are not dealt with
expanded. 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 \o Code completion for generated UI header files is updated only
after a build. after a build.
......
...@@ -182,9 +182,6 @@ ...@@ -182,9 +182,6 @@
<property name="layoutDirection"> <property name="layoutDirection">
<enum>Qt::LeftToRight</enum> <enum>Qt::LeftToRight</enum>
</property> </property>
<property name="frame">
<bool>false</bool>
</property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment