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/newdynamicpropertydialog.ui.h b/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h
index d0279cf21f..f5fd6f1fa4 100644
--- a/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h
+++ b/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h
@@ -42,20 +42,20 @@ public:
     void setupUi(QDialog *qdesigner_internal__NewDynamicPropertyDialog)
     {
         if (qdesigner_internal__NewDynamicPropertyDialog->objectName().isEmpty())
-            qdesigner_internal__NewDynamicPropertyDialog->setObjectName(QStringLiteral("qdesigner_internal__NewDynamicPropertyDialog"));
+            qdesigner_internal__NewDynamicPropertyDialog->setObjectName(QString::fromUtf8("qdesigner_internal__NewDynamicPropertyDialog"));
         qdesigner_internal__NewDynamicPropertyDialog->resize(340, 118);
         verticalLayout = new QVBoxLayout(qdesigner_internal__NewDynamicPropertyDialog);
-        verticalLayout->setObjectName(QStringLiteral("verticalLayout"));
+        verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
         formLayout = new QFormLayout();
-        formLayout->setObjectName(QStringLiteral("formLayout"));
+        formLayout->setObjectName(QString::fromUtf8("formLayout"));
         m_lineEdit = new QLineEdit(qdesigner_internal__NewDynamicPropertyDialog);
-        m_lineEdit->setObjectName(QStringLiteral("m_lineEdit"));
+        m_lineEdit->setObjectName(QString::fromUtf8("m_lineEdit"));
         m_lineEdit->setMinimumSize(QSize(220, 0));
 
         formLayout->setWidget(0, QFormLayout::FieldRole, m_lineEdit);
 
         label = new QLabel(qdesigner_internal__NewDynamicPropertyDialog);
-        label->setObjectName(QStringLiteral("label"));
+        label->setObjectName(QString::fromUtf8("label"));
         QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
         sizePolicy.setHorizontalStretch(0);
         sizePolicy.setVerticalStretch(0);
@@ -65,9 +65,9 @@ public:
         formLayout->setWidget(0, QFormLayout::LabelRole, label);
 
         horizontalLayout = new QHBoxLayout();
-        horizontalLayout->setObjectName(QStringLiteral("horizontalLayout"));
+        horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
         m_comboBox = new QComboBox(qdesigner_internal__NewDynamicPropertyDialog);
-        m_comboBox->setObjectName(QStringLiteral("m_comboBox"));
+        m_comboBox->setObjectName(QString::fromUtf8("m_comboBox"));
 
         horizontalLayout->addWidget(m_comboBox);
 
@@ -79,7 +79,7 @@ public:
         formLayout->setLayout(1, QFormLayout::FieldRole, horizontalLayout);
 
         label_2 = new QLabel(qdesigner_internal__NewDynamicPropertyDialog);
-        label_2->setObjectName(QStringLiteral("label_2"));
+        label_2->setObjectName(QString::fromUtf8("label_2"));
         sizePolicy.setHeightForWidth(label_2->sizePolicy().hasHeightForWidth());
         label_2->setSizePolicy(sizePolicy);
 
@@ -93,7 +93,7 @@ public:
         verticalLayout->addItem(spacerItem);
 
         m_buttonBox = new QDialogButtonBox(qdesigner_internal__NewDynamicPropertyDialog);
-        m_buttonBox->setObjectName(QStringLiteral("m_buttonBox"));
+        m_buttonBox->setObjectName(QString::fromUtf8("m_buttonBox"));
         m_buttonBox->setOrientation(Qt::Horizontal);
         m_buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
         m_buttonBox->setCenterButtons(false);