diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-18 09:47:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-18 09:47:21 +0200 |
| commit | 5df9fb29e13800932e00800059ba431a95de160b (patch) | |
| tree | 096a61564b0f5ee4a62549f2685cbe6a9b2261bf /src/qml/qml/qqmlengine.cpp | |
| parent | b03c85de2ab337858b44bf0a21692d7b544313a5 (diff) | |
| parent | 4840bc0c207aa09b4332842c67e65bc92f43d3bd (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I20c622263f40c322954328e4d10a8071db3ca6d1
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index dd54760760..517324a80f 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -406,7 +406,7 @@ The following functions are also on the Qt object. \li \c "ios" - iOS \li \c "tvos" - tvOS \li \c "linux" - Linux - \li \c "osx" - OS X + \li \c "osx" - \macos \li \c "unix" - Other Unix-based OS \li \c "windows" - Windows \li \c "winrt" - Windows Runtime |