summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-07-08 11:11:39 +0200
committerQt by Nokia <qt-info@nokia.com>2011-07-08 11:22:30 +0200
commit2e58f52ded89e1d925f7129bc6c70a1a8b72f765 (patch)
treea5fdffbb9e2f20d0eae984257cf7f679ac6f3fa7
parentd96b7b809e614dd416709acec768529457120b9f (diff)
Remove the qs() macro.
There is tootoo many risks of conflicts with existing code. QStringLiteral is not that hard to type. And if users want to use qs they can still define it in their own headers. Change-Id: I7da4772d902033fa163f5177c012b5d0e87332d7 Reviewed-on: http://codereview.qt.nokia.com/1357 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
-rw-r--r--src/corelib/tools/qstring.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h
index c10af450b3..de973a82fb 100644
--- a/src/corelib/tools/qstring.h
+++ b/src/corelib/tools/qstring.h
@@ -148,10 +148,6 @@ template<int n> struct QConstStringData
# define QStringLiteral(str) QLatin1String(str)
#endif
-#ifndef QT_NO_KEYWORDS
-#define qs(str) QStringLiteral(str)
-#endif
-
class Q_CORE_EXPORT QString
{
public: