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

diff --git a/tests/auto/tools/uic/baseline/pathpage.ui.h b/tests/auto/tools/uic/baseline/pathpage.ui.h
index 361831721b..eb151f9550 100644
--- a/tests/auto/tools/uic/baseline/pathpage.ui.h
+++ b/tests/auto/tools/uic/baseline/pathpage.ui.h
@@ -38,12 +38,12 @@ public:
     void setupUi(QWidget *PathPage)
     {
         if (PathPage->objectName().isEmpty())
-            PathPage->setObjectName(QStringLiteral("PathPage"));
+            PathPage->setObjectName(QString::fromUtf8("PathPage"));
         PathPage->resize(417, 243);
         gridLayout = new QGridLayout(PathPage);
-        gridLayout->setObjectName(QStringLiteral("gridLayout"));
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
         label_2 = new QLabel(PathPage);
-        label_2->setObjectName(QStringLiteral("label_2"));
+        label_2->setObjectName(QString::fromUtf8("label_2"));
         QSizePolicy sizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
         sizePolicy.setHorizontalStretch(0);
         sizePolicy.setVerticalStretch(0);
@@ -53,7 +53,7 @@ public:
         gridLayout->addWidget(label_2, 0, 0, 1, 1);
 
         filterLineEdit = new QLineEdit(PathPage);
-        filterLineEdit->setObjectName(QStringLiteral("filterLineEdit"));
+        filterLineEdit->setObjectName(QString::fromUtf8("filterLineEdit"));
 
         gridLayout->addWidget(filterLineEdit, 0, 1, 1, 2);
 
@@ -62,17 +62,17 @@ public:
         gridLayout->addItem(spacerItem, 1, 1, 1, 1);
 
         label = new QLabel(PathPage);
-        label->setObjectName(QStringLiteral("label"));
+        label->setObjectName(QString::fromUtf8("label"));
 
         gridLayout->addWidget(label, 2, 0, 1, 3);
 
         pathListWidget = new QListWidget(PathPage);
-        pathListWidget->setObjectName(QStringLiteral("pathListWidget"));
+        pathListWidget->setObjectName(QString::fromUtf8("pathListWidget"));
 
         gridLayout->addWidget(pathListWidget, 3, 0, 3, 3);
 
         addButton = new QPushButton(PathPage);
-        addButton->setObjectName(QStringLiteral("addButton"));
+        addButton->setObjectName(QString::fromUtf8("addButton"));
         QSizePolicy sizePolicy1(QSizePolicy::Maximum, QSizePolicy::Fixed);
         sizePolicy1.setHorizontalStretch(0);
         sizePolicy1.setVerticalStretch(0);
@@ -82,7 +82,7 @@ public:
         gridLayout->addWidget(addButton, 3, 3, 1, 1);
 
         removeButton = new QPushButton(PathPage);
-        removeButton->setObjectName(QStringLiteral("removeButton"));
+        removeButton->setObjectName(QString::fromUtf8("removeButton"));
         sizePolicy1.setHeightForWidth(removeButton->sizePolicy().hasHeightForWidth());
         removeButton->setSizePolicy(sizePolicy1);