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

diff --git a/tests/auto/tools/uic/baseline/translationsettings.ui.h b/tests/auto/tools/uic/baseline/translationsettings.ui.h
index 522c9bd4e0..764e3a85b6 100644
--- a/tests/auto/tools/uic/baseline/translationsettings.ui.h
+++ b/tests/auto/tools/uic/baseline/translationsettings.ui.h
@@ -36,7 +36,7 @@ public:
     void setupUi(QDialog *TranslationSettings)
     {
         if (TranslationSettings->objectName().isEmpty())
-            TranslationSettings->setObjectName(QStringLiteral("TranslationSettings"));
+            TranslationSettings->setObjectName(QString::fromUtf8("TranslationSettings"));
         TranslationSettings->resize(346, 125);
         vboxLayout = new QVBoxLayout(TranslationSettings);
 #ifndef Q_OS_MAC
@@ -45,9 +45,9 @@ public:
 #ifndef Q_OS_MAC
         vboxLayout->setContentsMargins(9, 9, 9, 9);
 #endif
-        vboxLayout->setObjectName(QStringLiteral("vboxLayout"));
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
         groupBox = new QGroupBox(TranslationSettings);
-        groupBox->setObjectName(QStringLiteral("groupBox"));
+        groupBox->setObjectName(QString::fromUtf8("groupBox"));
         gridLayout = new QGridLayout(groupBox);
 #ifndef Q_OS_MAC
         gridLayout->setSpacing(6);
@@ -55,24 +55,24 @@ public:
 #ifndef Q_OS_MAC
         gridLayout->setContentsMargins(9, 9, 9, 9);
 #endif
-        gridLayout->setObjectName(QStringLiteral("gridLayout"));
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
         cbLanguageList = new QComboBox(groupBox);
-        cbLanguageList->setObjectName(QStringLiteral("cbLanguageList"));
+        cbLanguageList->setObjectName(QString::fromUtf8("cbLanguageList"));
 
         gridLayout->addWidget(cbLanguageList, 0, 1, 1, 1);
 
         label = new QLabel(groupBox);
-        label->setObjectName(QStringLiteral("label"));
+        label->setObjectName(QString::fromUtf8("label"));
 
         gridLayout->addWidget(label, 0, 0, 1, 1);
 
         cbCountryList = new QComboBox(groupBox);
-        cbCountryList->setObjectName(QStringLiteral("cbCountryList"));
+        cbCountryList->setObjectName(QString::fromUtf8("cbCountryList"));
 
         gridLayout->addWidget(cbCountryList, 1, 1, 1, 1);
 
         lblCountry = new QLabel(groupBox);
-        lblCountry->setObjectName(QStringLiteral("lblCountry"));
+        lblCountry->setObjectName(QString::fromUtf8("lblCountry"));
 
         gridLayout->addWidget(lblCountry, 1, 0, 1, 1);
 
@@ -80,7 +80,7 @@ public:
         vboxLayout->addWidget(groupBox);
 
         buttonBox = new QDialogButtonBox(TranslationSettings);
-        buttonBox->setObjectName(QStringLiteral("buttonBox"));
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
         buttonBox->setOrientation(Qt::Horizontal);
         buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok);