diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-10-25 09:17:05 -0700 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-10-27 16:15:53 +0000 |
| commit | 2f7596e1bb6bf1bd16374a79be957c375f3751c7 (patch) | |
| tree | 5dab5d6f50ac109e9d781c2afea1917893993025 | |
| parent | 54e855b0f29240ec31b6ea51068ff63b1a54f36e (diff) | |
| download | qtbase-2f7596e1bb6bf1bd16374a79be957c375f3751c7.tar.gz | |
Tests: fix namespaced build on Windows
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 { }’
Change-Id: I07ec23f3cb174fb197c3fffd17215c1eeeadf7fd
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit d18d34134115d003808a7284c095bed694ebf685)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | tests/shared/filesystem.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/shared/filesystem.h b/tests/shared/filesystem.h index b59baf69b6..03d5cd56e6 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. |