diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-19 21:22:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-19 21:22:10 +0200 |
| commit | 79349119c66c2237d70fe4c13ebb9fe273ce2f85 (patch) | |
| tree | 4cfa3561f188a3904496cef330c79c1a687436ed /src/qml/qml/qqmlengine.cpp | |
| parent | bf3b596066af733c04b5ed3ef2dc9ec753a41e79 (diff) | |
| parent | 4f0988c3907406087dbfdc193abfbf767678d814 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I326616356ee26d4532c6d57558c43c919f0a900d
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index cdaa9e83e9..0cc96be5a8 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -405,10 +405,9 @@ 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 "wince" - Windows CE \li \c "winrt" - Windows Runtime \li \c "winphone" - Windows Phone \endlist |