diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2023-11-20 15:19:51 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@qt.io> | 2023-11-20 17:06:47 +0100 |
| commit | b49f3cb9f30e9a3390c743d0e1b7884058e4b187 (patch) | |
| tree | 08069845751f44cc0006cdf41d1b9449a0bf5306 /tests | |
| parent | 72e146e771782b32f0a5e74d935d66061ef00fd5 (diff) | |
Fix all outstanding namespace issues
Also replaced the old QT_PREPEND_NAMESPACE_AM macro with the real
namespace (QtAM::), as this makes the code easier to read for humans
and also for tools like qdbuscpp2xml.
The macro is still available, to support old custom appman code.
Change-Id: Ifb379f03c1aacbd12ef799beb43013bba029e514
Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/yaml/tst_yaml.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tests/auto/yaml/tst_yaml.cpp b/tests/auto/yaml/tst_yaml.cpp index 68bf7475..2c87c7c3 100644 --- a/tests/auto/yaml/tst_yaml.cpp +++ b/tests/auto/yaml/tst_yaml.cpp @@ -222,12 +222,7 @@ struct CacheTest QString value; }; -// GCC < 7 bug, currently still in RHEL7, https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56480 -// this should simply be: -// template<> class QT_PREPEND_NAMESPACE_AM(ConfigCacheAdaptor<CacheTest>) - -QT_BEGIN_NAMESPACE_AM -template<> class ConfigCacheAdaptor<CacheTest> +template<> class QtAM::ConfigCacheAdaptor<CacheTest> { public: CacheTest *loadFromSource(QIODevice *source, const QString &fileName) @@ -266,7 +261,6 @@ public: sourceContent.replace("${FILE}", fileName.toUtf8()); } }; -QT_END_NAMESPACE_AM void tst_Yaml::cache() { |