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, 17 insertions, 17 deletions

diff --git a/tests/auto/tools/uic/baseline/settings.ui.h b/tests/auto/tools/uic/baseline/settings.ui.h
index 6a1f11fa85..cc680c8033 100644
--- a/tests/auto/tools/uic/baseline/settings.ui.h
+++ b/tests/auto/tools/uic/baseline/settings.ui.h
@@ -47,14 +47,14 @@ public:
     void setupUi(QDialog *Dialog)
     {
         if (Dialog->objectName().isEmpty())
-            Dialog->setObjectName(QStringLiteral("Dialog"));
+            Dialog->setObjectName(QString::fromUtf8("Dialog"));
         Dialog->resize(392, 176);
         verticalLayout = new QVBoxLayout(Dialog);
-        verticalLayout->setObjectName(QStringLiteral("verticalLayout"));
+        verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
         hboxLayout = new QHBoxLayout();
-        hboxLayout->setObjectName(QStringLiteral("hboxLayout"));
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
         label = new QLabel(Dialog);
-        label->setObjectName(QStringLiteral("label"));
+        label->setObjectName(QString::fromUtf8("label"));
         QSizePolicy sizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
         sizePolicy.setHorizontalStretch(0);
         sizePolicy.setVerticalStretch(0);
@@ -66,7 +66,7 @@ public:
         hboxLayout->addWidget(label);
 
         deviceCombo = new QComboBox(Dialog);
-        deviceCombo->setObjectName(QStringLiteral("deviceCombo"));
+        deviceCombo->setObjectName(QString::fromUtf8("deviceCombo"));
         QSizePolicy sizePolicy1(QSizePolicy::Minimum, QSizePolicy::Fixed);
         sizePolicy1.setHorizontalStretch(0);
         sizePolicy1.setVerticalStretch(0);
@@ -79,9 +79,9 @@ public:
         verticalLayout->addLayout(hboxLayout);
 
         hboxLayout1 = new QHBoxLayout();
-        hboxLayout1->setObjectName(QStringLiteral("hboxLayout1"));
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
         label_6 = new QLabel(Dialog);
-        label_6->setObjectName(QStringLiteral("label_6"));
+        label_6->setObjectName(QString::fromUtf8("label_6"));
         sizePolicy.setHeightForWidth(label_6->sizePolicy().hasHeightForWidth());
         label_6->setSizePolicy(sizePolicy);
         label_6->setMinimumSize(QSize(90, 0));
@@ -90,7 +90,7 @@ public:
         hboxLayout1->addWidget(label_6);
 
         audioEffectsCombo = new QComboBox(Dialog);
-        audioEffectsCombo->setObjectName(QStringLiteral("audioEffectsCombo"));
+        audioEffectsCombo->setObjectName(QString::fromUtf8("audioEffectsCombo"));
         sizePolicy1.setHeightForWidth(audioEffectsCombo->sizePolicy().hasHeightForWidth());
         audioEffectsCombo->setSizePolicy(sizePolicy1);
 
@@ -100,9 +100,9 @@ public:
         verticalLayout->addLayout(hboxLayout1);
 
         hboxLayout2 = new QHBoxLayout();
-        hboxLayout2->setObjectName(QStringLiteral("hboxLayout2"));
+        hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
         crossFadeLabel = new QLabel(Dialog);
-        crossFadeLabel->setObjectName(QStringLiteral("crossFadeLabel"));
+        crossFadeLabel->setObjectName(QString::fromUtf8("crossFadeLabel"));
         sizePolicy.setHeightForWidth(crossFadeLabel->sizePolicy().hasHeightForWidth());
         crossFadeLabel->setSizePolicy(sizePolicy);
         crossFadeLabel->setMinimumSize(QSize(90, 0));
@@ -111,9 +111,9 @@ public:
         hboxLayout2->addWidget(crossFadeLabel);
 
         vboxLayout = new QVBoxLayout();
-        vboxLayout->setObjectName(QStringLiteral("vboxLayout"));
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
         crossFadeSlider = new QSlider(Dialog);
-        crossFadeSlider->setObjectName(QStringLiteral("crossFadeSlider"));
+        crossFadeSlider->setObjectName(QString::fromUtf8("crossFadeSlider"));
         sizePolicy1.setHeightForWidth(crossFadeSlider->sizePolicy().hasHeightForWidth());
         crossFadeSlider->setSizePolicy(sizePolicy1);
         crossFadeSlider->setMinimum(-20);
@@ -127,9 +127,9 @@ public:
         vboxLayout->addWidget(crossFadeSlider);
 
         hboxLayout3 = new QHBoxLayout();
-        hboxLayout3->setObjectName(QStringLiteral("hboxLayout3"));
+        hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
         label_3 = new QLabel(Dialog);
-        label_3->setObjectName(QStringLiteral("label_3"));
+        label_3->setObjectName(QString::fromUtf8("label_3"));
         QFont font;
         font.setPointSize(9);
         label_3->setFont(font);
@@ -141,7 +141,7 @@ public:
         hboxLayout3->addItem(spacerItem);
 
         label_5 = new QLabel(Dialog);
-        label_5->setObjectName(QStringLiteral("label_5"));
+        label_5->setObjectName(QString::fromUtf8("label_5"));
         label_5->setFont(font);
 
         hboxLayout3->addWidget(label_5);
@@ -151,7 +151,7 @@ public:
         hboxLayout3->addItem(spacerItem1);
 
         label_4 = new QLabel(Dialog);
-        label_4->setObjectName(QStringLiteral("label_4"));
+        label_4->setObjectName(QString::fromUtf8("label_4"));
         label_4->setFont(font);
 
         hboxLayout3->addWidget(label_4);
@@ -166,7 +166,7 @@ public:
         verticalLayout->addLayout(hboxLayout2);
 
         buttonBox = new QDialogButtonBox(Dialog);
-        buttonBox->setObjectName(QStringLiteral("buttonBox"));
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
         buttonBox->setOrientation(Qt::Horizontal);
         buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);