Replace Q_STATIC_GLOBAL_OPERATOR with static
authorThiago Macieira <thiago.macieira@intel.com>
Thu, 18 Dec 2014 02:19:52 +0000 (18:19 -0800)
committerThiago Macieira <thiago.macieira@intel.com>
Thu, 8 Jan 2015 16:55:59 +0000 (17:55 +0100)
This existed only for working around an RVCT compiler bug. Let's assume
anyone still using that compiler has upgraded to a version that has the
bug fixed.

Change-Id: Iee4e39893b68ea3f8a8d158229a93e741069b617
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
src/assistant/help/qhelpsearchindexwriter_clucene.cpp

index f0b8bb3..31f47af 100644 (file)
@@ -55,8 +55,6 @@
 
 #include <algorithm>
 
-#include "private/qfunctions_p.h"
-
 QT_BEGIN_NAMESPACE
 
 namespace fulltextsearch {
@@ -328,7 +326,7 @@ static const struct QTextHtmlEntity
     { "zwnj", 0x200c }
 };
 
-Q_STATIC_GLOBAL_OPERATOR bool operator<(const QTextHtmlEntity &entity, const QString &entityStr)
+static bool operator<(const QTextHtmlEntity &entity, const QString &entityStr)
 {
     return QLatin1String(entity.name) < entityStr;
 }