Commit f3155987 authored by Bill King's avatar Bill King Committed by hjk

Fixes compilation when QT is namespaced.

Change-Id: I5229e367d9468fcc25119c6efcb0f9127ac9a13d
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 761557d1
......@@ -35,6 +35,8 @@
#include <QtCore/QString>
QT_USE_NAMESPACE
namespace ProFileEvaluatorInternal {
/*!
......
......@@ -34,6 +34,7 @@
#include <QtTest/QtTest>
QT_BEGIN_NAMESPACE
bool operator==(const Utils::FileSearchResult &r1, const Utils::FileSearchResult &r2)
{
return r1.fileName == r2.fileName
......@@ -43,6 +44,7 @@ bool operator==(const Utils::FileSearchResult &r1, const Utils::FileSearchResult
&& r1.matchLength == r2.matchLength
&& r1.regexpCapturedTexts == r2.regexpCapturedTexts;
}
QT_END_NAMESPACE
class tst_FileSearch : public QObject
{
......
......@@ -38,14 +38,15 @@
#include <QtCore/QDebug>
#include <QtTest/QtTest>
QT_BEGIN_NAMESPACE
namespace QTest {
template<>
char *toString(const QTextCharFormat &format)
{
QByteArray ba = Formats::instance().name(format).toLatin1();
return qstrdup(ba.data());
}
template<> inline char *toString(const QTextCharFormat &format)
{
QByteArray ba = Formats::instance().name(format).toLatin1();
return qstrdup(ba.data());
}
}
QT_END_NAMESPACE
using namespace TextEditor;
using namespace Internal;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment