summaryrefslogtreecommitdiff
path: root/src/assistant/help
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2014-12-17 18:19:52 -0800
committerThiago Macieira <thiago.macieira@intel.com>2015-01-08 17:55:59 +0100
commit2157653eb9ecf0bfeb5acd6125464d4377153311 (patch)
treed127f5fde41b42dfef4cc960438173ded380130f /src/assistant/help
parent376501ae5a86859821c0e89b2e8fbc9906d11e07 (diff)
downloadqttools-2157653eb9ecf0bfeb5acd6125464d4377153311.tar.gz
Replace Q_STATIC_GLOBAL_OPERATOR with static
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>
Diffstat (limited to 'src/assistant/help')
-rw-r--r--src/assistant/help/qhelpsearchindexwriter_clucene.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/assistant/help/qhelpsearchindexwriter_clucene.cpp b/src/assistant/help/qhelpsearchindexwriter_clucene.cpp
index f0b8bb333..31f47af10 100644
--- a/src/assistant/help/qhelpsearchindexwriter_clucene.cpp
+++ b/src/assistant/help/qhelpsearchindexwriter_clucene.cpp
@@ -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;
}