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

diff --git a/tests/auto/tools/uic/baseline/inputpage.ui.h b/tests/auto/tools/uic/baseline/inputpage.ui.h
index fb7ae1ea6f..9367dec6df 100644
--- a/tests/auto/tools/uic/baseline/inputpage.ui.h
+++ b/tests/auto/tools/uic/baseline/inputpage.ui.h
@@ -35,16 +35,16 @@ public:
     void setupUi(QWidget *InputPage)
     {
         if (InputPage->objectName().isEmpty())
-            InputPage->setObjectName(QStringLiteral("InputPage"));
+            InputPage->setObjectName(QString::fromUtf8("InputPage"));
         InputPage->resize(417, 242);
         gridLayout = new QGridLayout(InputPage);
-        gridLayout->setObjectName(QStringLiteral("gridLayout"));
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
         spacerItem = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed);
 
         gridLayout->addItem(spacerItem, 0, 2, 1, 1);
 
         label = new QLabel(InputPage);
-        label->setObjectName(QStringLiteral("label"));
+        label->setObjectName(QString::fromUtf8("label"));
         QSizePolicy sizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
         sizePolicy.setHorizontalStretch(0);
         sizePolicy.setVerticalStretch(0);
@@ -55,14 +55,14 @@ public:
 
         hboxLayout = new QHBoxLayout();
         hboxLayout->setSpacing(0);
-        hboxLayout->setObjectName(QStringLiteral("hboxLayout"));
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
         fileLineEdit = new QLineEdit(InputPage);
-        fileLineEdit->setObjectName(QStringLiteral("fileLineEdit"));
+        fileLineEdit->setObjectName(QString::fromUtf8("fileLineEdit"));
 
         hboxLayout->addWidget(fileLineEdit);
 
         browseButton = new QToolButton(InputPage);
-        browseButton->setObjectName(QStringLiteral("browseButton"));
+        browseButton->setObjectName(QString::fromUtf8("browseButton"));
 
         hboxLayout->addWidget(browseButton);