diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2009-11-10 12:52:03 (GMT) |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2009-11-10 13:02:11 (GMT) |
| commit | d1c5585faa066a6693c24600cf8a1c42a285fe3b (patch) | |
| tree | 089ec414e6181c12d44d0f417ec33ee5541e8018 /tests | |
| parent | 5067c64c2356196f2086a97304f1a99309c09d69 (diff) | |
| download | Qt-d1c5585faa066a6693c24600cf8a1c42a285fe3b.zip Qt-d1c5585faa066a6693c24600cf8a1c42a285fe3b.tar.gz Qt-d1c5585faa066a6693c24600cf8a1c42a285fe3b.tar.bz2 | |
uic/Designer: Use correct margin defaults for custom page-based containers.
Designer-formbuilder/uic incorrectly considered custom containers that
do not inherit a known page-based container (say QTabWidget) as
instances of QLayoutWidget, giving them a default margin of 0.
Add a check for the custom widget <container>-element to the checks
for QLayoutWidget in uic/formbuilder.
In the formbuilder, introduce a new data structure to store
custom widget information instead of using 3 separate hashes.
Adapt one autotest baseline (Qt 3).
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
Task-number: QTBUG-5335
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/uic/baseline/mainwindowbase.ui.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/uic/baseline/mainwindowbase.ui.h b/tests/auto/uic/baseline/mainwindowbase.ui.h index 46270a7..8472dbb 100644 --- a/tests/auto/uic/baseline/mainwindowbase.ui.h +++ b/tests/auto/uic/baseline/mainwindowbase.ui.h @@ -221,7 +221,6 @@ public: hboxLayout->setSpacing(4); hboxLayout->setContentsMargins(8, 8, 8, 8); hboxLayout->setObjectName(QString::fromUtf8("hboxLayout")); - hboxLayout->setContentsMargins(0, 0, 0, 0); helpview = new QTextEdit(widget); helpview->setObjectName(QString::fromUtf8("helpview")); helpview->setMinimumSize(QSize(200, 0)); |