From d18d34134115d003808a7284c095bed694ebf685 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 25 Oct 2022 09:17:05 -0700 Subject: [PATCH] Tests: fix namespaced build on Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Amends 371214dea7f92b3170d0239b3d9944275adf951a. tst_qfile.cpp:401:9: error: reference to ‘QTest’ is ambiguous qttestglobal.h:27:11: note: candidates are: ‘namespace TestNamespace::QTest { } filesystem.h:28:11: note: ‘namespace QTest { }’ Pick-to: 6.4 Change-Id: I07ec23f3cb174fb197c3fffd17215c1eeeadf7fd Reviewed-by: Volker Hilsheimer --- tests/shared/filesystem.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/shared/filesystem.h b/tests/shared/filesystem.h index b59baf69b61..03d5cd56e60 100644 --- a/tests/shared/filesystem.h +++ b/tests/shared/filesystem.h @@ -25,9 +25,11 @@ #ifndef SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE // MinGW #define SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE (0x2) #endif +QT_BEGIN_NAMESPACE namespace QTest { static QString uncServerName() { return qgetenv("COMPUTERNAME"); } } +QT_END_NAMESPACE #endif // QTemporaryDir-based helper class for creating file-system hierarchies and cleaning up.