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

diff --git a/tests/auto/tools/uic/baseline/previewdialogbase.ui.h b/tests/auto/tools/uic/baseline/previewdialogbase.ui.h
index 7ea1e72e04..8d4c0dae9f 100644
--- a/tests/auto/tools/uic/baseline/previewdialogbase.ui.h
+++ b/tests/auto/tools/uic/baseline/previewdialogbase.ui.h
@@ -45,7 +45,7 @@ public:
     void setupUi(QDialog *PreviewDialogBase)
     {
         if (PreviewDialogBase->objectName().isEmpty())
-            PreviewDialogBase->setObjectName(QStringLiteral("PreviewDialogBase"));
+            PreviewDialogBase->setObjectName(QString::fromUtf8("PreviewDialogBase"));
         PreviewDialogBase->resize(733, 479);
         vboxLayout = new QVBoxLayout(PreviewDialogBase);
 #ifndef Q_OS_MAC
@@ -54,7 +54,7 @@ public:
 #ifndef Q_OS_MAC
         vboxLayout->setContentsMargins(9, 9, 9, 9);
 #endif
-        vboxLayout->setObjectName(QStringLiteral("vboxLayout"));
+        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
         hboxLayout = new QHBoxLayout();
 #ifndef Q_OS_MAC
         hboxLayout->setSpacing(6);
@@ -62,14 +62,14 @@ public:
 #ifndef Q_OS_MAC
         hboxLayout->setContentsMargins(0, 0, 0, 0);
 #endif
-        hboxLayout->setObjectName(QStringLiteral("hboxLayout"));
+        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
         label = new QLabel(PreviewDialogBase);
-        label->setObjectName(QStringLiteral("label"));
+        label->setObjectName(QString::fromUtf8("label"));
 
         hboxLayout->addWidget(label);
 
         paperSizeCombo = new QComboBox(PreviewDialogBase);
-        paperSizeCombo->setObjectName(QStringLiteral("paperSizeCombo"));
+        paperSizeCombo->setObjectName(QString::fromUtf8("paperSizeCombo"));
         QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(1), static_cast<QSizePolicy::Policy>(0));
         sizePolicy.setHorizontalStretch(0);
         sizePolicy.setVerticalStretch(0);
@@ -79,12 +79,12 @@ public:
         hboxLayout->addWidget(paperSizeCombo);
 
         label_2 = new QLabel(PreviewDialogBase);
-        label_2->setObjectName(QStringLiteral("label_2"));
+        label_2->setObjectName(QString::fromUtf8("label_2"));
 
         hboxLayout->addWidget(label_2);
 
         paperOrientationCombo = new QComboBox(PreviewDialogBase);
-        paperOrientationCombo->setObjectName(QStringLiteral("paperOrientationCombo"));
+        paperOrientationCombo->setObjectName(QString::fromUtf8("paperOrientationCombo"));
         sizePolicy.setHeightForWidth(paperOrientationCombo->sizePolicy().hasHeightForWidth());
         paperOrientationCombo->setSizePolicy(sizePolicy);
 
@@ -102,9 +102,9 @@ public:
         hboxLayout1->setSpacing(6);
 #endif
         hboxLayout1->setContentsMargins(0, 0, 0, 0);
-        hboxLayout1->setObjectName(QStringLiteral("hboxLayout1"));
+        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
         pageList = new QTreeWidget(PreviewDialogBase);
-        pageList->setObjectName(QStringLiteral("pageList"));
+        pageList->setObjectName(QString::fromUtf8("pageList"));
         pageList->setIndentation(0);
         pageList->setRootIsDecorated(false);
         pageList->setUniformRowHeights(true);
@@ -114,7 +114,7 @@ public:
         hboxLayout1->addWidget(pageList);
 
         previewArea = new QScrollArea(PreviewDialogBase);
-        previewArea->setObjectName(QStringLiteral("previewArea"));
+        previewArea->setObjectName(QString::fromUtf8("previewArea"));
         QSizePolicy sizePolicy1(static_cast<QSizePolicy::Policy>(5), static_cast<QSizePolicy::Policy>(5));
         sizePolicy1.setHorizontalStretch(1);
         sizePolicy1.setVerticalStretch(0);
@@ -131,9 +131,9 @@ public:
         hboxLayout2->setSpacing(6);
 #endif
         hboxLayout2->setContentsMargins(0, 0, 0, 0);
-        hboxLayout2->setObjectName(QStringLiteral("hboxLayout2"));
+        hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
         progressBar = new QProgressBar(PreviewDialogBase);
-        progressBar->setObjectName(QStringLiteral("progressBar"));
+        progressBar->setObjectName(QString::fromUtf8("progressBar"));
         progressBar->setEnabled(false);
         QSizePolicy sizePolicy2(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(0));
         sizePolicy2.setHorizontalStretch(1);
@@ -147,7 +147,7 @@ public:
         hboxLayout2->addWidget(progressBar);
 
         buttonBox = new QDialogButtonBox(PreviewDialogBase);
-        buttonBox->setObjectName(QStringLiteral("buttonBox"));
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
         buttonBox->setOrientation(Qt::Horizontal);
         buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok);