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/icontheme.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/icontheme.ui.h')
-rw-r--r-- | tests/auto/tools/uic/baseline/icontheme.ui.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/tools/uic/baseline/icontheme.ui.h b/tests/auto/tools/uic/baseline/icontheme.ui.h index 75a1b648cd..936d6b5cf7 100644 --- a/tests/auto/tools/uic/baseline/icontheme.ui.h +++ b/tests/auto/tools/uic/baseline/icontheme.ui.h @@ -29,39 +29,39 @@ public: void setupUi(QWidget *Form) { if (Form->objectName().isEmpty()) - Form->setObjectName(QStringLiteral("Form")); + Form->setObjectName(QString::fromUtf8("Form")); Form->resize(122, 117); verticalLayout = new QVBoxLayout(Form); - verticalLayout->setObjectName(QStringLiteral("verticalLayout")); + verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); fileicon = new QPushButton(Form); - fileicon->setObjectName(QStringLiteral("fileicon")); + fileicon->setObjectName(QString::fromUtf8("fileicon")); QIcon icon; - icon.addFile(QStringLiteral("image1.png"), QSize(), QIcon::Normal, QIcon::Off); + icon.addFile(QString::fromUtf8("image1.png"), QSize(), QIcon::Normal, QIcon::Off); fileicon->setIcon(icon); verticalLayout->addWidget(fileicon); fileandthemeicon = new QPushButton(Form); - fileandthemeicon->setObjectName(QStringLiteral("fileandthemeicon")); + fileandthemeicon->setObjectName(QString::fromUtf8("fileandthemeicon")); QIcon icon1; - QString iconThemeName = QStringLiteral("edit-copy"); + QString iconThemeName = QString::fromUtf8("edit-copy"); if (QIcon::hasThemeIcon(iconThemeName)) { icon1 = QIcon::fromTheme(iconThemeName); } else { - icon1.addFile(QStringLiteral("image7.png"), QSize(), QIcon::Normal, QIcon::Off); + icon1.addFile(QString::fromUtf8("image7.png"), QSize(), QIcon::Normal, QIcon::Off); } fileandthemeicon->setIcon(icon1); verticalLayout->addWidget(fileandthemeicon); themeicon = new QPushButton(Form); - themeicon->setObjectName(QStringLiteral("themeicon")); + themeicon->setObjectName(QString::fromUtf8("themeicon")); QIcon icon2; - iconThemeName = QStringLiteral("edit-copy"); + iconThemeName = QString::fromUtf8("edit-copy"); if (QIcon::hasThemeIcon(iconThemeName)) { icon2 = QIcon::fromTheme(iconThemeName); } else { - icon2.addFile(QStringLiteral(""), QSize(), QIcon::Normal, QIcon::Off); + icon2.addFile(QString::fromUtf8(""), QSize(), QIcon::Normal, QIcon::Off); } themeicon->setIcon(icon2); |