From 2e58f52ded89e1d925f7129bc6c70a1a8b72f765 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 8 Jul 2011 11:11:39 +0200 Subject: [PATCH] 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 --- src/corelib/tools/qstring.h | 4 ---- 1 file changed, 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 struct QConstStringData # define QStringLiteral(str) QLatin1String(str) #endif -#ifndef QT_NO_KEYWORDS -#define qs(str) QStringLiteral(str) -#endif - class Q_CORE_EXPORT QString { public: