diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-11-07 15:13:52 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-01 21:37:30 +0100 |
| commit | 2409ed7d48e8c0e34e79d8b750fe3e5432a0d3f9 (patch) | |
| tree | 1c6152eb055aecb71e4f999aa69d84f0ed34637a /src/corelib/kernel/qfunctions_winrt.cpp | |
| parent | 2bfc010b83974776f03fee011f5b2ab815fdbc2e (diff) | |
Fix placement of QT_{BEGIN,END}_NAMESPACE in qfunctions_winrt.h
Those functions weren't getting properly namespaced. Even if we're
testing WinRT namespaced builds, it wouldn't catch this mistake: those
functions would simply all be in the global namespace. I guess we don't
have a "namespace cleanliness" test.
Change-Id: I2d3d09dc66dad476563dbf51c171683be155ebfd
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
Reviewed-by: Andrew Knight <andrew.knight@theqtcompany.com>
Diffstat (limited to 'src/corelib/kernel/qfunctions_winrt.cpp')
| -rw-r--r-- | src/corelib/kernel/qfunctions_winrt.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/kernel/qfunctions_winrt.cpp b/src/corelib/kernel/qfunctions_winrt.cpp index 84e7b5688f..60faead122 100644 --- a/src/corelib/kernel/qfunctions_winrt.cpp +++ b/src/corelib/kernel/qfunctions_winrt.cpp @@ -37,7 +37,7 @@ #include "qbytearray.h" #include "qhash.h" -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE // Environment ------------------------------------------------------ inline QHash<QByteArray, QByteArray> &qt_app_environment() @@ -94,4 +94,6 @@ void qt_winrt__tzset() { } +QT_END_NAMESPACE + #endif // Q_OS_WINRT |