summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2021-11-10 16:36:23 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-11-11 11:00:10 +0000
commitfde96b1568abb87e8bfbf2a54fadb5c57f722157 (patch)
tree026ec0bbf1ba22138f40b9a6a22a482f816c76fc
parent7c713c4d2c176dbc4fa7eb0a670aa86e49f36716 (diff)
Add missing qt namespace in qthreadstorage.h
Wrap 'else QT_CONFIG(thread)' block in qthreadstorage.h with qt namespace Fixes: QTBUG-98085 Change-Id: Ica1817fa6beeaf9e4883edaa8738f042b29f0c5e Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit f6d210a0d32ce9e81a160bfb893342cb0a521f54) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/corelib/thread/qthreadstorage.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/thread/qthreadstorage.h b/src/corelib/thread/qthreadstorage.h
index b30e91c6c7..a7e93f03a5 100644
--- a/src/corelib/thread/qthreadstorage.h
+++ b/src/corelib/thread/qthreadstorage.h
@@ -158,6 +158,8 @@ QT_END_NAMESPACE
#include <type_traits>
+QT_BEGIN_NAMESPACE
+
template <typename T, typename U>
inline bool qThreadStorage_hasLocalData(const QScopedPointer<T, U> &data)
{
@@ -227,6 +229,8 @@ public:
}
};
+QT_END_NAMESPACE
+
#endif // QT_CONFIG(thread)
#endif // QTHREADSTORAGE_H