feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixes compilation when QT is namespaced.

Browse Source 
Change-Id: I5229e367d9468fcc25119c6efcb0f9127ac9a13d
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Bill King
2011-10-25 15:55:14 +02:00
committed by hjk
parent 761557d157
commit f315598749
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/shared/proparser/ioutils.h
View File

@@ -35,6 +35,8 @@
#include <QtCore/QString>
QT_USE_NAMESPACE
namespace ProFileEvaluatorInternal {
/*!

2
tests/auto/filesearch/tst_filesearch.cpp
View File

@@ -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
{

13
tests/auto/generichighlighter/highlighterengine/highlightermock.cpp
View File

@@ -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;