diff options
| author | Oliver Wolff <oliver.wolff@theqtcompany.com> | 2015-08-17 09:33:28 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@theqtcompany.com> | 2015-09-02 10:21:33 +0000 |
| commit | 8981703817f2a1a54a788d30e721935cec5ed9b8 (patch) | |
| tree | a83d4b0b5126ef99255304200a6054180fdfff83 | |
| parent | 54dbdc26bacd3ab776c99ebef734404ef2e08ce5 (diff) | |
QUuid: Also use CoCreateGuid on WinRt/Winphone and WinCE
Change-Id: Ie44bd50fa1f2d4224f65d08fb4d721c3651b49ac
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | src/corelib/plugin/quuid.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp index 812e2c9fb6..8b6dfc6932 100644 --- a/src/corelib/plugin/quuid.cpp +++ b/src/corelib/plugin/quuid.cpp @@ -891,7 +891,7 @@ bool QUuid::operator>(const QUuid &other) const Q_DECL_NOTHROW \sa variant(), version() */ -#if defined(Q_OS_WIN32) +#if defined(Q_OS_WIN) QT_BEGIN_INCLUDE_NAMESPACE #include <objbase.h> // For CoCreateGuid @@ -905,7 +905,7 @@ QUuid QUuid::createUuid() return result; } -#else // !Q_OS_WIN32 +#else // Q_OS_WIN QT_BEGIN_INCLUDE_NAMESPACE #include "qdatetime.h" @@ -989,7 +989,7 @@ QUuid QUuid::createUuid() return result; } -#endif // !Q_OS_WIN32 +#endif // !Q_OS_WIN /*! \fn bool QUuid::operator==(const GUID &guid) const |