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

diff --git a/tests/auto/tools/uic/baseline/certificateinfo.ui.h b/tests/auto/tools/uic/baseline/certificateinfo.ui.h
index 07263bcdd7..2aa47d40ad 100644
--- a/tests/auto/tools/uic/baseline/certificateinfo.ui.h
+++ b/tests/auto/tools/uic/baseline/certificateinfo.ui.h
@@ -38,16 +38,16 @@ public:
     void setupUi(QDialog *CertificateInfo)
     {
         if (CertificateInfo->objectName().isEmpty())
-            CertificateInfo->setObjectName(QStringLiteral("CertificateInfo"));
+            CertificateInfo->setObjectName(QString::fromUtf8("CertificateInfo"));
         CertificateInfo->resize(400, 397);
         vboxLayout = new QVBoxLayout(CertificateInfo);
-        vboxLayout->setObjectName(QStringLiteral("vboxLayout"));
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
         groupBox = new QGroupBox(CertificateInfo);
-        groupBox->setObjectName(QStringLiteral("groupBox"));
+        groupBox->setObjectName(QString::fromUtf8("groupBox"));
         hboxLayout = new QHBoxLayout(groupBox);
-        hboxLayout->setObjectName(QStringLiteral("hboxLayout"));
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
         certificationPathView = new QListWidget(groupBox);
-        certificationPathView->setObjectName(QStringLiteral("certificationPathView"));
+        certificationPathView->setObjectName(QString::fromUtf8("certificationPathView"));
 
         hboxLayout->addWidget(certificationPathView);
 
@@ -55,11 +55,11 @@ public:
         vboxLayout->addWidget(groupBox);
 
         groupBox_2 = new QGroupBox(CertificateInfo);
-        groupBox_2->setObjectName(QStringLiteral("groupBox_2"));
+        groupBox_2->setObjectName(QString::fromUtf8("groupBox_2"));
         hboxLayout1 = new QHBoxLayout(groupBox_2);
-        hboxLayout1->setObjectName(QStringLiteral("hboxLayout1"));
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
         certificateInfoView = new QListWidget(groupBox_2);
-        certificateInfoView->setObjectName(QStringLiteral("certificateInfoView"));
+        certificateInfoView->setObjectName(QString::fromUtf8("certificateInfoView"));
 
         hboxLayout1->addWidget(certificateInfoView);
 
@@ -67,13 +67,13 @@ public:
         vboxLayout->addWidget(groupBox_2);
 
         hboxLayout2 = new QHBoxLayout();
-        hboxLayout2->setObjectName(QStringLiteral("hboxLayout2"));
+        hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
         spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
 
         hboxLayout2->addItem(spacerItem);
 
         buttonBox = new QDialogButtonBox(CertificateInfo);
-        buttonBox->setObjectName(QStringLiteral("buttonBox"));
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
         buttonBox->setStandardButtons(QDialogButtonBox::Close);
 
         hboxLayout2->addWidget(buttonBox);