From e4fd1f2e0c22f6ca2354cffce78e5c0138b61e8d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 14 Oct 2016 15:38:38 +0200 Subject: [PATCH] fix build of qmldesigner coretests against namespaced qt Change-Id: I6fcd87a4f1a3e59994ca13d559a215b789f02e96 Reviewed-by: Tim Jenssen Reviewed-by: Thomas Hartmann --- tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp index 2031d36aaa6..00bfa7b4a64 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));