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

diff --git a/tests/auto/tools/uic/baseline/default.ui.h b/tests/auto/tools/uic/baseline/default.ui.h
index 4fae8e7130..fafff9d728 100644
--- a/tests/auto/tools/uic/baseline/default.ui.h
+++ b/tests/auto/tools/uic/baseline/default.ui.h
@@ -63,18 +63,18 @@ public:
     void setupUi(QMainWindow *MainWindow)
     {
         if (MainWindow->objectName().isEmpty())
-            MainWindow->setObjectName(QStringLiteral("MainWindow"));
+            MainWindow->setObjectName(QString::fromUtf8("MainWindow"));
         MainWindow->resize(388, 413);
         exitAction = new QAction(MainWindow);
-        exitAction->setObjectName(QStringLiteral("exitAction"));
+        exitAction->setObjectName(QString::fromUtf8("exitAction"));
         aboutQtAction = new QAction(MainWindow);
-        aboutQtAction->setObjectName(QStringLiteral("aboutQtAction"));
+        aboutQtAction->setObjectName(QString::fromUtf8("aboutQtAction"));
         editStyleAction = new QAction(MainWindow);
-        editStyleAction->setObjectName(QStringLiteral("editStyleAction"));
+        editStyleAction->setObjectName(QString::fromUtf8("editStyleAction"));
         aboutAction = new QAction(MainWindow);
-        aboutAction->setObjectName(QStringLiteral("aboutAction"));
+        aboutAction->setObjectName(QString::fromUtf8("aboutAction"));
         centralwidget = new QWidget(MainWindow);
-        centralwidget->setObjectName(QStringLiteral("centralwidget"));
+        centralwidget->setObjectName(QString::fromUtf8("centralwidget"));
         gridLayout = new QGridLayout(centralwidget);
 #ifndef Q_OS_MAC
         gridLayout->setSpacing(6);
@@ -82,9 +82,9 @@ public:
 #ifndef Q_OS_MAC
         gridLayout->setContentsMargins(9, 9, 9, 9);
 #endif
-        gridLayout->setObjectName(QStringLiteral("gridLayout"));
+        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
         nameLabel = new QLabel(centralwidget);
-        nameLabel->setObjectName(QStringLiteral("nameLabel"));
+        nameLabel->setObjectName(QString::fromUtf8("nameLabel"));
 
         gridLayout->addWidget(nameLabel, 0, 0, 1, 1);
 
@@ -93,7 +93,7 @@ public:
         nameCombo->addItem(QString());
         nameCombo->addItem(QString());
         nameCombo->addItem(QString());
-        nameCombo->setObjectName(QStringLiteral("nameCombo"));
+        nameCombo->setObjectName(QString::fromUtf8("nameCombo"));
         nameCombo->setEditable(true);
 
         gridLayout->addWidget(nameCombo, 0, 1, 1, 3);
@@ -103,62 +103,62 @@ public:
         gridLayout->addItem(spacerItem, 1, 3, 1, 1);
 
         femaleRadioButton = new QRadioButton(centralwidget);
-        femaleRadioButton->setObjectName(QStringLiteral("femaleRadioButton"));
+        femaleRadioButton->setObjectName(QString::fromUtf8("femaleRadioButton"));
 
         gridLayout->addWidget(femaleRadioButton, 1, 2, 1, 1);
 
         agreeCheckBox = new QCheckBox(centralwidget);
-        agreeCheckBox->setObjectName(QStringLiteral("agreeCheckBox"));
+        agreeCheckBox->setObjectName(QString::fromUtf8("agreeCheckBox"));
 
         gridLayout->addWidget(agreeCheckBox, 6, 0, 1, 4);
 
         maleRadioButton = new QRadioButton(centralwidget);
-        maleRadioButton->setObjectName(QStringLiteral("maleRadioButton"));
+        maleRadioButton->setObjectName(QString::fromUtf8("maleRadioButton"));
 
         gridLayout->addWidget(maleRadioButton, 1, 1, 1, 1);
 
         genderLabel = new QLabel(centralwidget);
-        genderLabel->setObjectName(QStringLiteral("genderLabel"));
+        genderLabel->setObjectName(QString::fromUtf8("genderLabel"));
 
         gridLayout->addWidget(genderLabel, 1, 0, 1, 1);
 
         ageSpinBox = new QSpinBox(centralwidget);
-        ageSpinBox->setObjectName(QStringLiteral("ageSpinBox"));
+        ageSpinBox->setObjectName(QString::fromUtf8("ageSpinBox"));
         ageSpinBox->setMinimum(12);
         ageSpinBox->setValue(22);
 
         gridLayout->addWidget(ageSpinBox, 2, 1, 1, 3);
 
         buttonBox = new QDialogButtonBox(centralwidget);
-        buttonBox->setObjectName(QStringLiteral("buttonBox"));
+        buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
         buttonBox->setOrientation(Qt::Horizontal);
         buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok);
 
         gridLayout->addWidget(buttonBox, 7, 2, 1, 2);
 
         ageLabel = new QLabel(centralwidget);
-        ageLabel->setObjectName(QStringLiteral("ageLabel"));
+        ageLabel->setObjectName(QString::fromUtf8("ageLabel"));
 
         gridLayout->addWidget(ageLabel, 2, 0, 1, 1);
 
         passwordLabel = new QLabel(centralwidget);
-        passwordLabel->setObjectName(QStringLiteral("passwordLabel"));
+        passwordLabel->setObjectName(QString::fromUtf8("passwordLabel"));
 
         gridLayout->addWidget(passwordLabel, 3, 0, 1, 1);
 
         passwordEdit = new QLineEdit(centralwidget);
-        passwordEdit->setObjectName(QStringLiteral("passwordEdit"));
+        passwordEdit->setObjectName(QString::fromUtf8("passwordEdit"));
         passwordEdit->setEchoMode(QLineEdit::Password);
 
         gridLayout->addWidget(passwordEdit, 3, 1, 1, 3);
 
         label = new QLabel(centralwidget);
-        label->setObjectName(QStringLiteral("label"));
+        label->setObjectName(QString::fromUtf8("label"));
 
         gridLayout->addWidget(label, 5, 0, 1, 1);
 
         countryLabel = new QLabel(centralwidget);
-        countryLabel->setObjectName(QStringLiteral("countryLabel"));
+        countryLabel->setObjectName(QString::fromUtf8("countryLabel"));
 
         gridLayout->addWidget(countryLabel, 4, 0, 1, 1);
 
@@ -166,7 +166,7 @@ public:
         new QListWidgetItem(professionList);
         new QListWidgetItem(professionList);
         new QListWidgetItem(professionList);
-        professionList->setObjectName(QStringLiteral("professionList"));
+        professionList->setObjectName(QString::fromUtf8("professionList"));
 
         gridLayout->addWidget(professionList, 5, 1, 1, 3);
 
@@ -176,21 +176,21 @@ public:
         countryCombo->addItem(QString());
         countryCombo->addItem(QString());
         countryCombo->addItem(QString());
-        countryCombo->setObjectName(QStringLiteral("countryCombo"));
+        countryCombo->setObjectName(QString::fromUtf8("countryCombo"));
 
         gridLayout->addWidget(countryCombo, 4, 1, 1, 3);
 
         MainWindow->setCentralWidget(centralwidget);
         menubar = new QMenuBar(MainWindow);
-        menubar->setObjectName(QStringLiteral("menubar"));
+        menubar->setObjectName(QString::fromUtf8("menubar"));
         menubar->setGeometry(QRect(0, 0, 388, 21));
         menu_File = new QMenu(menubar);
-        menu_File->setObjectName(QStringLiteral("menu_File"));
+        menu_File->setObjectName(QString::fromUtf8("menu_File"));
         menu_Help = new QMenu(menubar);
-        menu_Help->setObjectName(QStringLiteral("menu_Help"));
+        menu_Help->setObjectName(QString::fromUtf8("menu_Help"));
         MainWindow->setMenuBar(menubar);
         statusbar = new QStatusBar(MainWindow);
-        statusbar->setObjectName(QStringLiteral("statusbar"));
+        statusbar->setObjectName(QString::fromUtf8("statusbar"));
         MainWindow->setStatusBar(statusbar);
 #ifndef QT_NO_SHORTCUT
         nameLabel->setBuddy(nameCombo);