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>

diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h
index c10af45..de973a8 100644 (file)
--- 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: