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>

1 files changed, 13 insertions, 13 deletions

diff --git a/tests/auto/tools/uic/baseline/myform.ui.h b/tests/auto/tools/uic/baseline/myform.ui.h
index d52c1ecf75..d3a08e04c9 100644
--- a/tests/auto/tools/uic/baseline/myform.ui.h
+++ b/tests/auto/tools/uic/baseline/myform.ui.h
@@ -41,35 +41,35 @@ public:
     void setupUi(QWidget *Form)
     {
         if (Form->objectName().isEmpty())
-            Form->setObjectName(QStringLiteral("Form"));
+            Form->setObjectName(QString::fromUtf8("Form"));
         Form->resize(258, 224);
         vboxLayout = new QVBoxLayout(Form);
 #ifndef Q_OS_MAC
         vboxLayout->setSpacing(6);
 #endif
         vboxLayout->setContentsMargins(8, 8, 8, 8);
-        vboxLayout->setObjectName(QStringLiteral("vboxLayout"));
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
         groupBox = new QGroupBox(Form);
-        groupBox->setObjectName(QStringLiteral("groupBox"));
+        groupBox->setObjectName(QString::fromUtf8("groupBox"));
         gridLayout = new QGridLayout(groupBox);
 #ifndef Q_OS_MAC
         gridLayout->setSpacing(6);
 #endif
         gridLayout->setContentsMargins(8, 8, 8, 8);
-        gridLayout->setObjectName(QStringLiteral("gridLayout"));
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
         radioButton_2 = new QRadioButton(groupBox);
-        radioButton_2->setObjectName(QStringLiteral("radioButton_2"));
+        radioButton_2->setObjectName(QString::fromUtf8("radioButton_2"));
 
         gridLayout->addWidget(radioButton_2, 1, 0, 1, 1);
 
         radioButton = new QRadioButton(groupBox);
-        radioButton->setObjectName(QStringLiteral("radioButton"));
+        radioButton->setObjectName(QString::fromUtf8("radioButton"));
         radioButton->setChecked(true);
 
         gridLayout->addWidget(radioButton, 0, 0, 1, 1);
 
         checkBox_2 = new QCheckBox(groupBox);
-        checkBox_2->setObjectName(QStringLiteral("checkBox_2"));
+        checkBox_2->setObjectName(QString::fromUtf8("checkBox_2"));
         checkBox_2->setChecked(true);
 
         gridLayout->addWidget(checkBox_2, 1, 1, 1, 1);
@@ -79,32 +79,32 @@ public:
         gridLayout->addItem(spacerItem, 5, 0, 1, 1);
 
         checkBox = new QCheckBox(groupBox);
-        checkBox->setObjectName(QStringLiteral("checkBox"));
+        checkBox->setObjectName(QString::fromUtf8("checkBox"));
 
         gridLayout->addWidget(checkBox, 0, 1, 1, 1);
 
         radioButton_2_2 = new QRadioButton(groupBox);
-        radioButton_2_2->setObjectName(QStringLiteral("radioButton_2_2"));
+        radioButton_2_2->setObjectName(QString::fromUtf8("radioButton_2_2"));
 
         gridLayout->addWidget(radioButton_2_2, 2, 0, 1, 1);
 
         radioButton_3 = new QRadioButton(groupBox);
-        radioButton_3->setObjectName(QStringLiteral("radioButton_3"));
+        radioButton_3->setObjectName(QString::fromUtf8("radioButton_3"));
 
         gridLayout->addWidget(radioButton_3, 3, 0, 1, 1);
 
         radioButton_4 = new QRadioButton(groupBox);
-        radioButton_4->setObjectName(QStringLiteral("radioButton_4"));
+        radioButton_4->setObjectName(QString::fromUtf8("radioButton_4"));
 
         gridLayout->addWidget(radioButton_4, 4, 0, 1, 1);
 
         checkBox_3 = new QCheckBox(groupBox);
-        checkBox_3->setObjectName(QStringLiteral("checkBox_3"));
+        checkBox_3->setObjectName(QString::fromUtf8("checkBox_3"));
 
         gridLayout->addWidget(checkBox_3, 2, 1, 1, 1);
 
         checkBox_4 = new QCheckBox(groupBox);
-        checkBox_4->setObjectName(QStringLiteral("checkBox_4"));
+        checkBox_4->setObjectName(QString::fromUtf8("checkBox_4"));
         checkBox_4->setChecked(true);
 
         gridLayout->addWidget(checkBox_4, 3, 1, 1, 1);