diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-14 15:38:38 +0200 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> | 2016-10-14 14:24:34 +0000 |
| commit | e4fd1f2e0c22f6ca2354cffce78e5c0138b61e8d (patch) | |
| tree | 420bb0d069678dadc327414b231fa68bb6749f00 /tests/auto | |
| parent | 614d14274d37941b3dbd432249748efea49380f5 (diff) | |
| download | qt-creator-e4fd1f2e0c22f6ca2354cffce78e5c0138b61e8d.tar.gz | |
fix build of qmldesigner coretests against namespaced qt
Change-Id: I6fcd87a4f1a3e59994ca13d559a215b789f02e96
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp index 2031d36aaa..00bfa7b4a6 100644 --- a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp +++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp @@ -86,6 +86,8 @@ using namespace QmlDesigner; # define SHARE_PATH "/share/qtcreator" #endif +QT_BEGIN_NAMESPACE + //Allow comparison of QByteArray and QString. We always assume utf8 as the encoding. namespace QTest { bool qCompare(const QString &string, const QByteArray &array, const char *actual, @@ -103,6 +105,8 @@ namespace QTest { } +QT_END_NAMESPACE + QString resourcePath() { return QDir::cleanPath(QTCREATORDIR + QLatin1String(SHARE_PATH)); |