whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always generate size hint for spacer items 

Task-number: QTBUG-55008
Change-Id: I53c86b64aa3c0a3e5f80551baefe775c2d4b1e90
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
bb10
Jarek Kobus 2016-07-29 12:28:07 +02:00 committed by Jarek Kobus
parent 874852d625
commit 385ab06fb1
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/uic/cpp/cppwriteinitialization.cpp
View File

@ -89,10 +89,14 @@ namespace {
const QHash<QString, DomProperty *> properties = propertyMap(node->elementProperty());
output << "new QSpacerItem(";
int w = 0;
int h = 0;
if (properties.contains(QLatin1String("sizeHint"))) {
const DomSize *sizeHint = properties.value(QLatin1String("sizeHint"))->elementSize();
output << sizeHint->elementWidth() << ", " << sizeHint->elementHeight() << ", ";
w = sizeHint->elementWidth();
h = sizeHint->elementHeight();
}
output << w << ", " << h << ", ";
// size type
QString sizeType = properties.contains(QLatin1String("sizeType")) ?

4
tests/auto/tools/uic/baseline/imagedialog.ui.h
View File

@ -155,7 +155,7 @@ public:
vboxLayout->addLayout(gridLayout);
spacerItem = new QSpacerItem(QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
vboxLayout->addItem(spacerItem);
@ -166,7 +166,7 @@ public:
hboxLayout->setContentsMargins(1, 1, 1, 1);
hboxLayout->setObjectName(QStringLiteral("hboxLayout"));
hboxLayout->setObjectName(QStringLiteral(""));
spacerItem1 = new QSpacerItem(QSizePolicy::Expanding, QSizePolicy::Minimum);
spacerItem1 = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
hboxLayout->addItem(spacerItem1);

2
tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h
View File

@ -91,7 +91,7 @@ public:
verticalLayout->addLayout(formLayout);
spacerItem = new QSpacerItem(QSizePolicy::Minimum, QSizePolicy::Expanding);
spacerItem = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
verticalLayout->addItem(spacerItem);