summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qglobal.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-05-09 13:48:42 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-05-09 13:48:42 +0200
commit552c45bea924279a0a7c2d78c9d7e2959deee11f (patch)
treeee4326efe97420b1cda12118fd6309b4b6668c75 /src/corelib/global/qglobal.cpp
parente110ab6c282790f6f035d52747b8589c448a362b (diff)
parenta7863a58545a6c59eaf16f36905efcbf0e4f94f9 (diff)
Merge remote-tracking branch 'origin/5.11.0' into 5.11
Diffstat (limited to 'src/corelib/global/qglobal.cpp')
-rw-r--r--src/corelib/global/qglobal.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 21f22a32ba..2ca627e851 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -2856,7 +2856,7 @@ enum {
};
/*!
- \since 5.10
+ \since 5.11
Returns a unique ID for this machine, if one can be determined. If no
unique ID could be determined, this function returns an empty byte array.
@@ -2929,7 +2929,7 @@ QByteArray QSysInfo::machineUniqueId()
}
/*!
- \since 5.10
+ \since 5.11
Returns a unique ID for this machine's boot, if one can be determined. If
no unique ID could be determined, this function returns an empty byte