From 9f710b15f0b1651a26d5b80c2bcb48104bd12db2 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 20 Sep 2018 12:34:31 +0200 Subject: uic: Write the float and double properties in 'f' format Make the code consistent with the DomProperty::write() method. Task-number: QTBUG-70613 Change-Id: I622b4a019a4473823584de97304f8324f2cf0c6b Reviewed-by: Friedemann Kleint --- tests/auto/tools/uic/baseline/buttongroup.ui.h | 20 +++++++-------- .../auto/tools/uic/baseline/qpagesetupwidget.ui.h | 14 +++++----- .../auto/tools/uic/baseline/qtgradienteditor.ui.h | 30 +++++++++++----------- tests/auto/tools/uic/baseline/validators.ui.h | 14 +++++----- 4 files changed, 39 insertions(+), 39 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/tools/uic/baseline/buttongroup.ui.h b/tests/auto/tools/uic/baseline/buttongroup.ui.h index ddc3995d4b..87814dcba1 100644 --- a/tests/auto/tools/uic/baseline/buttongroup.ui.h +++ b/tests/auto/tools/uic/baseline/buttongroup.ui.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'buttongroup.ui' ** -** Created by: Qt User Interface Compiler version 5.10.1 +** Created by: Qt User Interface Compiler version 5.12.0 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -129,9 +129,9 @@ public: sizePolicy3.setHeightForWidth(periodSpinBox->sizePolicy().hasHeightForWidth()); periodSpinBox->setSizePolicy(sizePolicy3); periodSpinBox->setMinimumSize(QSize(0, 30)); - periodSpinBox->setMinimum(-1); - periodSpinBox->setSingleStep(0.1); - periodSpinBox->setValue(-1); + periodSpinBox->setMinimum(-1.000000000000000); + periodSpinBox->setSingleStep(0.100000000000000); + periodSpinBox->setValue(-1.000000000000000); formLayout->setWidget(0, QFormLayout::FieldRole, periodSpinBox); @@ -139,9 +139,9 @@ public: amplitudeSpinBox->setObjectName(QString::fromUtf8("amplitudeSpinBox")); amplitudeSpinBox->setEnabled(false); amplitudeSpinBox->setMinimumSize(QSize(0, 30)); - amplitudeSpinBox->setMinimum(-1); - amplitudeSpinBox->setSingleStep(0.1); - amplitudeSpinBox->setValue(-1); + amplitudeSpinBox->setMinimum(-1.000000000000000); + amplitudeSpinBox->setSingleStep(0.100000000000000); + amplitudeSpinBox->setValue(-1.000000000000000); formLayout->setWidget(2, QFormLayout::FieldRole, amplitudeSpinBox); @@ -155,9 +155,9 @@ public: overshootSpinBox->setObjectName(QString::fromUtf8("overshootSpinBox")); overshootSpinBox->setEnabled(false); overshootSpinBox->setMinimumSize(QSize(0, 30)); - overshootSpinBox->setMinimum(-1); - overshootSpinBox->setSingleStep(0.1); - overshootSpinBox->setValue(-1); + overshootSpinBox->setMinimum(-1.000000000000000); + overshootSpinBox->setSingleStep(0.100000000000000); + overshootSpinBox->setValue(-1.000000000000000); formLayout->setWidget(4, QFormLayout::FieldRole, overshootSpinBox); diff --git a/tests/auto/tools/uic/baseline/qpagesetupwidget.ui.h b/tests/auto/tools/uic/baseline/qpagesetupwidget.ui.h index e914c664d3..a5379bc468 100644 --- a/tests/auto/tools/uic/baseline/qpagesetupwidget.ui.h +++ b/tests/auto/tools/uic/baseline/qpagesetupwidget.ui.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'qpagesetupwidget.ui' ** -** Created by: Qt User Interface Compiler version 5.9.0 +** Created by: Qt User Interface Compiler version 5.12.0 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -104,7 +104,7 @@ public: horizontalLayout_3->setObjectName(QString::fromUtf8("horizontalLayout_3")); pageWidth = new QDoubleSpinBox(groupBox_2); pageWidth->setObjectName(QString::fromUtf8("pageWidth")); - pageWidth->setMaximum(9999.99); + pageWidth->setMaximum(9999.989999999999782); horizontalLayout_3->addWidget(pageWidth); @@ -115,7 +115,7 @@ public: pageHeight = new QDoubleSpinBox(groupBox_2); pageHeight->setObjectName(QString::fromUtf8("pageHeight")); - pageHeight->setMaximum(9999.99); + pageHeight->setMaximum(9999.989999999999782); horizontalLayout_3->addWidget(pageHeight); @@ -199,7 +199,7 @@ public: topMargin = new QDoubleSpinBox(groupBox); topMargin->setObjectName(QString::fromUtf8("topMargin")); topMargin->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); - topMargin->setMaximum(999.99); + topMargin->setMaximum(999.990000000000009); gridLayout->addWidget(topMargin, 0, 1, 1, 1); @@ -212,7 +212,7 @@ public: leftMargin = new QDoubleSpinBox(groupBox); leftMargin->setObjectName(QString::fromUtf8("leftMargin")); leftMargin->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); - leftMargin->setMaximum(999.99); + leftMargin->setMaximum(999.990000000000009); horizontalLayout->addWidget(leftMargin); @@ -223,7 +223,7 @@ public: rightMargin = new QDoubleSpinBox(groupBox); rightMargin->setObjectName(QString::fromUtf8("rightMargin")); rightMargin->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); - rightMargin->setMaximum(999.99); + rightMargin->setMaximum(999.990000000000009); horizontalLayout->addWidget(rightMargin); @@ -241,7 +241,7 @@ public: bottomMargin = new QDoubleSpinBox(groupBox); bottomMargin->setObjectName(QString::fromUtf8("bottomMargin")); bottomMargin->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); - bottomMargin->setMaximum(999.99); + bottomMargin->setMaximum(999.990000000000009); gridLayout->addWidget(bottomMargin, 2, 1, 1, 1); diff --git a/tests/auto/tools/uic/baseline/qtgradienteditor.ui.h b/tests/auto/tools/uic/baseline/qtgradienteditor.ui.h index 21dc9551d0..9db07f35ac 100644 --- a/tests/auto/tools/uic/baseline/qtgradienteditor.ui.h +++ b/tests/auto/tools/uic/baseline/qtgradienteditor.ui.h @@ -31,7 +31,7 @@ /******************************************************************************** ** Form generated from reading UI file 'qtgradienteditor.ui' ** -** Created by: Qt User Interface Compiler version 5.0.0 +** Created by: Qt User Interface Compiler version 5.12.0 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -176,8 +176,8 @@ public: spinBox1->setGeometry(QRect(279, 69, 73, 23)); spinBox1->setKeyboardTracking(false); spinBox1->setDecimals(3); - spinBox1->setMaximum(1); - spinBox1->setSingleStep(0.01); + spinBox1->setMaximum(1.000000000000000); + spinBox1->setSingleStep(0.010000000000000); label2 = new QLabel(QtGradientEditor); label2->setObjectName(QString::fromUtf8("label2")); label2->setGeometry(QRect(209, 99, 64, 23)); @@ -186,8 +186,8 @@ public: spinBox2->setGeometry(QRect(279, 99, 73, 23)); spinBox2->setKeyboardTracking(false); spinBox2->setDecimals(3); - spinBox2->setMaximum(1); - spinBox2->setSingleStep(0.01); + spinBox2->setMaximum(1.000000000000000); + spinBox2->setSingleStep(0.010000000000000); label3 = new QLabel(QtGradientEditor); label3->setObjectName(QString::fromUtf8("label3")); label3->setGeometry(QRect(209, 129, 64, 23)); @@ -196,8 +196,8 @@ public: spinBox3->setGeometry(QRect(279, 129, 73, 23)); spinBox3->setKeyboardTracking(false); spinBox3->setDecimals(3); - spinBox3->setMaximum(1); - spinBox3->setSingleStep(0.01); + spinBox3->setMaximum(1.000000000000000); + spinBox3->setSingleStep(0.010000000000000); label4 = new QLabel(QtGradientEditor); label4->setObjectName(QString::fromUtf8("label4")); label4->setGeometry(QRect(209, 159, 64, 23)); @@ -206,8 +206,8 @@ public: spinBox4->setGeometry(QRect(279, 159, 73, 23)); spinBox4->setKeyboardTracking(false); spinBox4->setDecimals(3); - spinBox4->setMaximum(1); - spinBox4->setSingleStep(0.01); + spinBox4->setMaximum(1.000000000000000); + spinBox4->setSingleStep(0.010000000000000); label5 = new QLabel(QtGradientEditor); label5->setObjectName(QString::fromUtf8("label5")); label5->setGeometry(QRect(209, 189, 64, 23)); @@ -216,8 +216,8 @@ public: spinBox5->setGeometry(QRect(279, 189, 73, 23)); spinBox5->setKeyboardTracking(false); spinBox5->setDecimals(3); - spinBox5->setMaximum(1); - spinBox5->setSingleStep(0.01); + spinBox5->setMaximum(1.000000000000000); + spinBox5->setSingleStep(0.010000000000000); gradientStopsWidget = new QtGradientStopsWidget(QtGradientEditor); gradientStopsWidget->setObjectName(QString::fromUtf8("gradientStopsWidget")); gradientStopsWidget->setGeometry(QRect(10, 225, 193, 67)); @@ -390,10 +390,10 @@ public: positionSpinBox->setObjectName(QString::fromUtf8("positionSpinBox")); positionSpinBox->setKeyboardTracking(false); positionSpinBox->setDecimals(3); - positionSpinBox->setMinimum(0); - positionSpinBox->setMaximum(1); - positionSpinBox->setSingleStep(0.01); - positionSpinBox->setValue(0); + positionSpinBox->setMinimum(0.000000000000000); + positionSpinBox->setMaximum(1.000000000000000); + positionSpinBox->setSingleStep(0.010000000000000); + positionSpinBox->setValue(0.000000000000000); vboxLayout1->addWidget(positionSpinBox); diff --git a/tests/auto/tools/uic/baseline/validators.ui.h b/tests/auto/tools/uic/baseline/validators.ui.h index 0595cf2037..d0ae777f65 100644 --- a/tests/auto/tools/uic/baseline/validators.ui.h +++ b/tests/auto/tools/uic/baseline/validators.ui.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'validators.ui' ** -** Created by: Qt User Interface Compiler version 5.10.0 +** Created by: Qt User Interface Compiler version 5.12.0 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -252,9 +252,9 @@ public: doubleMinVal->setObjectName(QString::fromUtf8("doubleMinVal")); sizePolicy.setHeightForWidth(doubleMinVal->sizePolicy().hasHeightForWidth()); doubleMinVal->setSizePolicy(sizePolicy); - doubleMinVal->setMinimum(-100000); - doubleMinVal->setMaximum(100000); - doubleMinVal->setValue(0); + doubleMinVal->setMinimum(-100000.000000000000000); + doubleMinVal->setMaximum(100000.000000000000000); + doubleMinVal->setValue(0.000000000000000); gridLayout1->addWidget(doubleMinVal, 0, 1, 1, 1); @@ -281,9 +281,9 @@ public: doubleMaxVal->setObjectName(QString::fromUtf8("doubleMaxVal")); sizePolicy.setHeightForWidth(doubleMaxVal->sizePolicy().hasHeightForWidth()); doubleMaxVal->setSizePolicy(sizePolicy); - doubleMaxVal->setMinimum(-100000); - doubleMaxVal->setMaximum(100000); - doubleMaxVal->setValue(1000); + doubleMaxVal->setMinimum(-100000.000000000000000); + doubleMaxVal->setMaximum(100000.000000000000000); + doubleMaxVal->setValue(1000.000000000000000); gridLayout1->addWidget(doubleMaxVal, 1, 1, 1, 1); -- cgit v1.2.3