diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-05-12 11:58:08 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-05-16 19:41:13 +0000 |
| commit | 298a60d958c6dbebc3c3d863f375884c071209c0 (patch) | |
| tree | 39283c0ce73ced73f5ead3d717949f345edc075d /src/corelib | |
| parent | a2c4e68141b4b80d317f5295aa687b5cb4f1dd9c (diff) | |
WinRT: fix namespaced build
Change-Id: I0505523a5524995e374dc8f005f101d0cea8b01e
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qfunctions_winrt.h | 8 | ||||
| -rw-r--r-- | src/corelib/thread/qthread_p.h | 14 |
2 files changed, 16 insertions, 6 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 { diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h index b8544b1f0a..2008f76621 100644 --- a/src/corelib/thread/qthread_p.h +++ b/src/corelib/thread/qthread_p.h @@ -57,6 +57,16 @@ #include <algorithm> +#ifdef Q_OS_WINRT +namespace ABI { + namespace Windows { + namespace Foundation { + struct IAsyncAction; + } + } +} +#endif // Q_OS_WINRT + QT_BEGIN_NAMESPACE class QAbstractEventDispatcher; @@ -125,10 +135,6 @@ private: #ifndef QT_NO_THREAD -#ifdef Q_OS_WINRT -namespace ABI { namespace Windows { namespace Foundation { struct IAsyncAction; } } } -#endif - class QThreadPrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QThread) |