diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-27 12:59:04 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-27 12:59:04 +0200 |
| commit | a1922317f8b2c219176553ff3f0db815f6f16cfd (patch) | |
| tree | f90b3725afcfdd5efce59ad698bd1b347f26900e /src/qml/qml/qqmlengine.cpp | |
| parent | 02bf3ca59ea1aa4af0ce39d2f4fc856ce47f9966 (diff) | |
| parent | ffe861a0785056a90c787172400fa6061acfcc32 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I59f34fafd795694981dd1edffca1d322657f1ae6
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 673fbfefbb..71fea41f78 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 |