From ff18b02f21a04f7092b58be04be5a40df3ef993b Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 13 Jul 2018 09:02:14 +0000 Subject: 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 --- tests/auto/tools/uic/baseline/chatmainwindow.ui.h | 32 +++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'tests/auto/tools/uic/baseline/chatmainwindow.ui.h') diff --git a/tests/auto/tools/uic/baseline/chatmainwindow.ui.h b/tests/auto/tools/uic/baseline/chatmainwindow.ui.h index 921eb376de..8d4ccd53ae 100644 --- a/tests/auto/tools/uic/baseline/chatmainwindow.ui.h +++ b/tests/auto/tools/uic/baseline/chatmainwindow.ui.h @@ -48,16 +48,16 @@ public: void setupUi(QMainWindow *ChatMainWindow) { if (ChatMainWindow->objectName().isEmpty()) - ChatMainWindow->setObjectName(QStringLiteral("ChatMainWindow")); + ChatMainWindow->setObjectName(QString::fromUtf8("ChatMainWindow")); ChatMainWindow->resize(800, 600); actionQuit = new QAction(ChatMainWindow); - actionQuit->setObjectName(QStringLiteral("actionQuit")); + actionQuit->setObjectName(QString::fromUtf8("actionQuit")); actionAboutQt = new QAction(ChatMainWindow); - actionAboutQt->setObjectName(QStringLiteral("actionAboutQt")); + actionAboutQt->setObjectName(QString::fromUtf8("actionAboutQt")); actionChangeNickname = new QAction(ChatMainWindow); - actionChangeNickname->setObjectName(QStringLiteral("actionChangeNickname")); + actionChangeNickname->setObjectName(QString::fromUtf8("actionChangeNickname")); centralwidget = new QWidget(ChatMainWindow); - centralwidget->setObjectName(QStringLiteral("centralwidget")); + centralwidget->setObjectName(QString::fromUtf8("centralwidget")); hboxLayout = new QHBoxLayout(centralwidget); #ifndef Q_OS_MAC hboxLayout->setSpacing(6); @@ -65,7 +65,7 @@ public: #ifndef Q_OS_MAC hboxLayout->setContentsMargins(9, 9, 9, 9); #endif - hboxLayout->setObjectName(QStringLiteral("hboxLayout")); + hboxLayout->setObjectName(QString::fromUtf8("hboxLayout")); vboxLayout = new QVBoxLayout(); #ifndef Q_OS_MAC vboxLayout->setSpacing(6); @@ -73,9 +73,9 @@ public: #ifndef Q_OS_MAC vboxLayout->setContentsMargins(0, 0, 0, 0); #endif - vboxLayout->setObjectName(QStringLiteral("vboxLayout")); + vboxLayout->setObjectName(QString::fromUtf8("vboxLayout")); chatHistory = new QTextBrowser(centralwidget); - chatHistory->setObjectName(QStringLiteral("chatHistory")); + chatHistory->setObjectName(QString::fromUtf8("chatHistory")); chatHistory->setAcceptDrops(false); chatHistory->setAcceptRichText(true); @@ -86,19 +86,19 @@ public: hboxLayout1->setSpacing(6); #endif hboxLayout1->setContentsMargins(0, 0, 0, 0); - hboxLayout1->setObjectName(QStringLiteral("hboxLayout1")); + hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1")); label = new QLabel(centralwidget); - label->setObjectName(QStringLiteral("label")); + label->setObjectName(QString::fromUtf8("label")); hboxLayout1->addWidget(label); messageLineEdit = new QLineEdit(centralwidget); - messageLineEdit->setObjectName(QStringLiteral("messageLineEdit")); + messageLineEdit->setObjectName(QString::fromUtf8("messageLineEdit")); hboxLayout1->addWidget(messageLineEdit); sendButton = new QPushButton(centralwidget); - sendButton->setObjectName(QStringLiteral("sendButton")); + sendButton->setObjectName(QString::fromUtf8("sendButton")); QSizePolicy sizePolicy(static_cast(1), static_cast(0)); sizePolicy.setHorizontalStretch(0); sizePolicy.setVerticalStretch(0); @@ -115,15 +115,15 @@ public: ChatMainWindow->setCentralWidget(centralwidget); menubar = new QMenuBar(ChatMainWindow); - menubar->setObjectName(QStringLiteral("menubar")); + menubar->setObjectName(QString::fromUtf8("menubar")); menubar->setGeometry(QRect(0, 0, 800, 31)); menuQuit = new QMenu(menubar); - menuQuit->setObjectName(QStringLiteral("menuQuit")); + menuQuit->setObjectName(QString::fromUtf8("menuQuit")); menuFile = new QMenu(menubar); - menuFile->setObjectName(QStringLiteral("menuFile")); + menuFile->setObjectName(QString::fromUtf8("menuFile")); ChatMainWindow->setMenuBar(menubar); statusbar = new QStatusBar(ChatMainWindow); - statusbar->setObjectName(QStringLiteral("statusbar")); + statusbar->setObjectName(QString::fromUtf8("statusbar")); ChatMainWindow->setStatusBar(statusbar); #ifndef QT_NO_SHORTCUT label->setBuddy(messageLineEdit); -- cgit v1.2.3