diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-22 11:30:25 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-22 11:30:26 +0200 |
| commit | 8eeede619f417904cbd33fd44143f857dfce0996 (patch) | |
| tree | ad89f79cf5fb56f3de5fc4a8dc7c4e2c8e2c419e /src/qml/qml/qqmlengine.cpp | |
| parent | b8f145547e5477cd67f464c2d834f60a84f4aad6 (diff) | |
| parent | 3ef4fac9ff3f785d3ccbda4b28ec2c0ea2ee1b59 (diff) | |
Merge dev into 5.8
Change-Id: If0f273d3d33cec20edda539de6372337c2e4e969
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 c939af93ef..7e4fe73ba1 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -407,10 +407,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 |