diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-03 10:23:56 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-03 10:23:56 +0200 |
| commit | e2f66f921594b7be4af4a058c959557489e86879 (patch) | |
| tree | cc44931708b57bd5a761906797c7dee0360d1d6b /src/corelib/kernel/qfunctions_winrt.h | |
| parent | 933bf178aab88ab5df8a68cbf02611d6d8744b1b (diff) | |
| parent | 754efa57d89c62d1796e01b407e9222e67450f52 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/corelib/global/qnamespace.qdoc
src/corelib/io/qwindowspipereader.cpp
src/corelib/io/qwindowspipereader_p.h
src/corelib/statemachine/qstatemachine.cpp
src/corelib/statemachine/qstatemachine_p.h
src/plugins/platforms/xcb/qxcbconnection.h
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/tools/qmake/tst_qmake.cpp
tests/manual/touch/main.cpp
Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62
Diffstat (limited to 'src/corelib/kernel/qfunctions_winrt.h')
| -rw-r--r-- | src/corelib/kernel/qfunctions_winrt.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/corelib/kernel/qfunctions_winrt.h b/src/corelib/kernel/qfunctions_winrt.h index 3fff52a22c..7efd042456 100644 --- a/src/corelib/kernel/qfunctions_winrt.h +++ b/src/corelib/kernel/qfunctions_winrt.h @@ -131,9 +131,13 @@ generate_inline_return_func2(_putenv_s, errno_t, const char *, const char *) generate_inline_return_func0(tzset, void) generate_inline_return_func0(_tzset, void) -QT_BEGIN_NAMESPACE +namespace Microsoft { + namespace WRL { + template <typename T> class ComPtr; + } +} -namespace Microsoft { namespace WRL { template <typename T> class ComPtr; } } +QT_BEGIN_NAMESPACE namespace QWinRTFunctions { |