AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QUuid: Also use CoCreateGuid on WinRt/Winphone and WinCE

Browse Source 
Change-Id: Ie44bd50fa1f2d4224f65d08fb4d721c3651b49ac
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oliver Wolff 2015-08-17 09:33:28 +02:00
parent 54dbdc26ba
commit 8981703817
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/plugin/quuid.cpp
View File

@ -891,7 +891,7 @@ bool QUuid::operator>(const QUuid &other) const Q_DECL_NOTHROW
\sa variant(), version() \sa variant(), version()
*/ */
#if defined(Q_OS_WIN32) #if defined(Q_OS_WIN)
QT_BEGIN_INCLUDE_NAMESPACE QT_BEGIN_INCLUDE_NAMESPACE
#include <objbase.h> // For CoCreateGuid #include <objbase.h> // For CoCreateGuid
@ -905,7 +905,7 @@ QUuid QUuid::createUuid()
return result; return result;
} }
#else // !Q_OS_WIN32 #else // Q_OS_WIN
QT_BEGIN_INCLUDE_NAMESPACE QT_BEGIN_INCLUDE_NAMESPACE
#include "qdatetime.h" #include "qdatetime.h"
@ -989,7 +989,7 @@ QUuid QUuid::createUuid()
return result; return result;
} }
#endif // !Q_OS_WIN32 #endif // !Q_OS_WIN
/*! /*!
\fn bool QUuid::operator==(const GUID &guid) const \fn bool QUuid::operator==(const GUID &guid) const