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

fix build of qmldesigner coretests against namespaced qt

Browse Source 
Change-Id: I6fcd87a4f1a3e59994ca13d559a215b789f02e96
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen
2016-10-14 15:38:38 +02:00
committed by Thomas Hartmann
parent 614d14274d
commit e4fd1f2e0c
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
View File

@@ -86,6 +86,8 @@ using namespace QmlDesigner;
# define SHARE_PATH "/share/qtcreator" # define SHARE_PATH "/share/qtcreator"
#endif #endif
QT_BEGIN_NAMESPACE
//Allow comparison of QByteArray and QString. We always assume utf8 as the encoding. //Allow comparison of QByteArray and QString. We always assume utf8 as the encoding.
namespace QTest { namespace QTest {
bool qCompare(const QString &string, const QByteArray &array, const char *actual, bool qCompare(const QString &string, const QByteArray &array, const char *actual,
@@ -103,6 +105,8 @@ namespace QTest {
} }
QT_END_NAMESPACE
QString resourcePath() QString resourcePath()
{ {
return QDir::cleanPath(QTCREATORDIR + QLatin1String(SHARE_PATH)); return QDir::cleanPath(QTCREATORDIR + QLatin1String(SHARE_PATH));