diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-25 23:26:42 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-25 23:26:56 +0200 |
| commit | c0f6bdd39501aff887b39954122f74fb1e9bdc6c (patch) | |
| tree | 7189cea236b2a9a37498d65ae89b92c494b59649 /src/qml/qml/qqmlengine.cpp | |
| parent | ac06540d7aa0df2f6ceea0b82db724a2216d1b8c (diff) | |
| parent | a4754a30abc6f650885cbd20d0419da26a504220 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I6e060496b8c252fb4e2d5d2d40ae16bf950e2ec4
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index b36f35f3eb..18dbedbed6 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -391,9 +391,9 @@ The following functions are also on the Qt object. \list \li \c "android" - Android \li \c "blackberry" - BlackBerry OS - \li \c "ios" - Apple iOS + \li \c "ios" - iOS \li \c "linux" - Linux - \li \c "mac" - Mac OS X + \li \c "osx" - OS X \li \c "unix" - Other Unix-based OS \li \c "windows" - Windows \li \c "wince" - Windows CE |