diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-25 14:02:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-25 14:02:04 +0200 |
| commit | a1ad9a74ebb3c556c5f70f7e03be68b09598ac53 (patch) | |
| tree | 615a96db418219a57a745a5899e39a9ac90744ec /src/corelib/plugin | |
| parent | 6d78b7a0c46ea04f4bb771d960e2f7dff1362341 (diff) | |
| parent | 462f355e4fb16cc7a1838fa2dda0f763eee58c84 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/corelib/io/io.pri
src/corelib/io/qdatastream.cpp
src/corelib/io/qdatastream.h
src/network/socket/qabstractsocket.cpp
src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h
src/widgets/styles/qgtkstyle.cpp
tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro
tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro
tests/auto/dbus/qdbusconnection/qdbusconnection.pro
tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
Change-Id: I347549a024eb5bfa986699e0a11f96cc55c797a7
Diffstat (limited to 'src/corelib/plugin')
| -rw-r--r-- | src/corelib/plugin/quuid.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp index 812e2c9fb6..6698b140af 100644 --- a/src/corelib/plugin/quuid.cpp +++ b/src/corelib/plugin/quuid.cpp @@ -857,7 +857,7 @@ bool QUuid::operator>(const QUuid &other) const Q_DECL_NOTHROW different variant field, the return value is determined by comparing the two \l{QUuid::Variant} {variants}. - \sa variant() + \sa QUuid::variant() */ /*! @@ -871,7 +871,7 @@ bool QUuid::operator>(const QUuid &other) const Q_DECL_NOTHROW different variant field, the return value is determined by comparing the two \l{QUuid::Variant} {variants}. - \sa variant() + \sa QUuid::variant() */ /*! @@ -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 |