diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2018-07-13 09:02:14 +0000 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2018-07-19 12:38:45 +0000 |
commit | ff18b02f21a04f7092b58be04be5a40df3ef993b (patch) | |
tree | 66c268bc6bab9c38f27c682f0a3fd4093080da97 /tests/auto/tools/uic/baseline/querywidget.ui.h | |
parent | 519fcb38a2b9e2c4490e8a3c740ad43227a71b77 (diff) |
uic: Revert the microoptimization patch introducing QStringLiteral
This reverts the following commits:
d12d2949d1e4ac08a47928ef27bc45459b3fb104
26c3bec09bccf9006f5ef4945a428d9ef56c1d12
49b08f96e824f49fab9aa5c9a1a0ed582d4558bb
We can't easily predict all code paths for QDesigner
with such a microoptimization. We also don't want
to generate three different string constructions
depending on some sophisticated heuristics.
[ChangeLog][uic] The -no-stringliteral option is now deprecated and
UIC will not generate QStringLiteral anymore.
Task-number: QTBUG-65251
Task-number: QTBUG-51602
Change-Id: I34a5a1934a8df19c5c84ac2ba8e5168ce5665037
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/tools/uic/baseline/querywidget.ui.h')
-rw-r--r-- | tests/auto/tools/uic/baseline/querywidget.ui.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/tests/auto/tools/uic/baseline/querywidget.ui.h b/tests/auto/tools/uic/baseline/querywidget.ui.h index 0e941a0e5e..81516722d5 100644 --- a/tests/auto/tools/uic/baseline/querywidget.ui.h +++ b/tests/auto/tools/uic/baseline/querywidget.ui.h @@ -46,13 +46,13 @@ public: void setupUi(QMainWindow *QueryWidget) { if (QueryWidget->objectName().isEmpty()) - QueryWidget->setObjectName(QStringLiteral("QueryWidget")); + QueryWidget->setObjectName(QString::fromUtf8("QueryWidget")); QueryWidget->resize(545, 531); centralwidget = new QWidget(QueryWidget); - centralwidget->setObjectName(QStringLiteral("centralwidget")); + centralwidget->setObjectName(QString::fromUtf8("centralwidget")); centralwidget->setGeometry(QRect(0, 29, 545, 480)); verticalLayout = new QVBoxLayout(centralwidget); - verticalLayout->setObjectName(QStringLiteral("verticalLayout")); + verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); vboxLayout = new QVBoxLayout(); #ifndef Q_OS_MAC vboxLayout->setSpacing(6); @@ -60,12 +60,12 @@ public: #ifndef Q_OS_MAC vboxLayout->setContentsMargins(0, 0, 0, 0); #endif - vboxLayout->setObjectName(QStringLiteral("vboxLayout")); + vboxLayout->setObjectName(QString::fromUtf8("vboxLayout")); inputGroupBox = new QGroupBox(centralwidget); - inputGroupBox->setObjectName(QStringLiteral("inputGroupBox")); + inputGroupBox->setObjectName(QString::fromUtf8("inputGroupBox")); inputGroupBox->setMinimumSize(QSize(550, 120)); verticalLayout_4 = new QVBoxLayout(inputGroupBox); - verticalLayout_4->setObjectName(QStringLiteral("verticalLayout_4")); + verticalLayout_4->setObjectName(QString::fromUtf8("verticalLayout_4")); _2 = new QVBoxLayout(); #ifndef Q_OS_MAC _2->setSpacing(6); @@ -73,9 +73,9 @@ public: #ifndef Q_OS_MAC _2->setContentsMargins(0, 0, 0, 0); #endif - _2->setObjectName(QStringLiteral("_2")); + _2->setObjectName(QString::fromUtf8("_2")); inputTextEdit = new QTextEdit(inputGroupBox); - inputTextEdit->setObjectName(QStringLiteral("inputTextEdit")); + inputTextEdit->setObjectName(QString::fromUtf8("inputTextEdit")); _2->addWidget(inputTextEdit); @@ -86,17 +86,17 @@ public: vboxLayout->addWidget(inputGroupBox); queryGroupBox = new QGroupBox(centralwidget); - queryGroupBox->setObjectName(QStringLiteral("queryGroupBox")); + queryGroupBox->setObjectName(QString::fromUtf8("queryGroupBox")); queryGroupBox->setMinimumSize(QSize(550, 120)); verticalLayout_5 = new QVBoxLayout(queryGroupBox); - verticalLayout_5->setObjectName(QStringLiteral("verticalLayout_5")); + verticalLayout_5->setObjectName(QString::fromUtf8("verticalLayout_5")); defaultQueries = new QComboBox(queryGroupBox); - defaultQueries->setObjectName(QStringLiteral("defaultQueries")); + defaultQueries->setObjectName(QString::fromUtf8("defaultQueries")); verticalLayout_5->addWidget(defaultQueries); queryTextEdit = new QTextEdit(queryGroupBox); - queryTextEdit->setObjectName(QStringLiteral("queryTextEdit")); + queryTextEdit->setObjectName(QString::fromUtf8("queryTextEdit")); queryTextEdit->setMinimumSize(QSize(400, 60)); queryTextEdit->setReadOnly(true); queryTextEdit->setAcceptRichText(false); @@ -107,10 +107,10 @@ public: vboxLayout->addWidget(queryGroupBox); outputGroupBox = new QGroupBox(centralwidget); - outputGroupBox->setObjectName(QStringLiteral("outputGroupBox")); + outputGroupBox->setObjectName(QString::fromUtf8("outputGroupBox")); outputGroupBox->setMinimumSize(QSize(550, 120)); verticalLayout_6 = new QVBoxLayout(outputGroupBox); - verticalLayout_6->setObjectName(QStringLiteral("verticalLayout_6")); + verticalLayout_6->setObjectName(QString::fromUtf8("verticalLayout_6")); _3 = new QVBoxLayout(); #ifndef Q_OS_MAC _3->setSpacing(6); @@ -118,9 +118,9 @@ public: #ifndef Q_OS_MAC _3->setContentsMargins(0, 0, 0, 0); #endif - _3->setObjectName(QStringLiteral("_3")); + _3->setObjectName(QString::fromUtf8("_3")); outputTextEdit = new QTextEdit(outputGroupBox); - outputTextEdit->setObjectName(QStringLiteral("outputTextEdit")); + outputTextEdit->setObjectName(QString::fromUtf8("outputTextEdit")); outputTextEdit->setMinimumSize(QSize(500, 80)); outputTextEdit->setReadOnly(true); outputTextEdit->setAcceptRichText(false); @@ -138,11 +138,11 @@ public: QueryWidget->setCentralWidget(centralwidget); menubar = new QMenuBar(QueryWidget); - menubar->setObjectName(QStringLiteral("menubar")); + menubar->setObjectName(QString::fromUtf8("menubar")); menubar->setGeometry(QRect(0, 0, 545, 29)); QueryWidget->setMenuBar(menubar); statusbar = new QStatusBar(QueryWidget); - statusbar->setObjectName(QStringLiteral("statusbar")); + statusbar->setObjectName(QString::fromUtf8("statusbar")); statusbar->setGeometry(QRect(0, 509, 545, 22)); QueryWidget->setStatusBar(statusbar); |