diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:36:04 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:36:04 +0100 |
| commit | ad67ec26d0cbc98e3440dd38bb20eef4da2ee96d (patch) | |
| tree | 9f8135751df2f995a4f55837ea065a4687245b71 /src/qml/qml/qqmlengine.cpp | |
| parent | 83a16630c13969e68cd3a5aaab73335ccb0d4414 (diff) | |
| parent | 20d160d0513a04be187ed851a25b029f47c27b27 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
LICENSE.GPLv2
examples/qml/networkaccessmanagerfactory/view.qml
src/qml/jsruntime/qv4runtime.cpp
src/qml/jsruntime/qv4stringobject.cpp
Change-Id: I5d12f436d60995e51d5c2f59d364e9cbc24f8e32
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 33be4c321f..916f848bbe 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -368,7 +368,7 @@ The following functions are also on the Qt object. /*! \qmlproperty object Qt::platform - \since 4.8 + \since 5.1 The \c platform object provides info about the underlying platform. @@ -392,6 +392,8 @@ The following functions are also on the Qt object. \li \c "unix" - Other Unix-based OS \li \c "windows" - Windows \li \c "wince" - Windows CE + \li \c "winrt" - Windows RT + \li \c "winphone" - Windows Phone \endlist \endtable */ |