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 --- src/tools/uic/cpp/cppwriteinitialization.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/tools/uic/cpp/cppwriteinitialization.h') diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h index 21116057d4..2ba0b1352a 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.h +++ b/src/tools/uic/cpp/cppwriteinitialization.h @@ -139,8 +139,6 @@ struct WriteInitialization : public TreeWalker private: static QString domColor2QString(const DomColor *c); - QString writeString(const QString &s, const QString &indent) const; - QString iconCall(const DomProperty *prop); QString pixCall(const DomProperty *prop) const; QString pixCall(const QString &type, const QString &text) const; @@ -230,7 +228,6 @@ private: private: QString writeFontProperties(const DomFont *f); - void writeResourceIcon(QTextStream &output, const QString &iconName, const QString &indent, const DomResourceIcon *i) const; QString writeIconProperties(const DomResourceIcon *i); QString writeSizePolicy(const DomSizePolicy *sp); QString writeBrushInitialization(const DomBrush *brush); -- cgit v1.2.3