diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2013-01-14 18:12:50 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-14 17:21:25 +0100 |
commit | 5e6b2bf68b2338ad9424b48193b860a70addd022 (patch) | |
tree | 2cbea11284433bda3aad6af2eb434e9c7f83c7e8 /src/qml/qml/qqmlengine.cpp | |
parent | d3fa421bd0958fbcea63941a48227fb3664d4d52 (diff) |
Add QQmlPlatform (exposed as Qt.platform)
Change-Id: If34603fd8fbd907bc063b52ea31848eabdb49f61
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Alan Alpert <aalpert@rim.com>
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
-rw-r--r-- | src/qml/qml/qqmlengine.cpp | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 5657cacf7d..074ea51ce3 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -92,6 +92,7 @@ #include "qqmlbind_p.h" #include "qqmlconnections_p.h" #include "qqmltimer_p.h" +#include "qqmlplatform_p.h" #include <private/qquickpackage_p.h> #include <private/qqmldelegatemodel_p.h> #include <private/qqmlobjectmodel_p.h> @@ -367,6 +368,36 @@ The following functions are also on the Qt object. */ /*! + \qmlproperty object Qt::platform + \since QtQml 2.1 + + The \c platform object provides info about the underlying platform. + + Its properties are: + + \table + \row + \li \c platform.os + \li + + This read-only property contains the name of the operating system. + + Possible values are: + + \list + \li \c "android" - Android + \li \c "blackberry" - BlackBerry OS + \li \c "ios" - Apple iOS + \li \c "linux" - Linux + \li \c "mac" - Mac OS X + \li \c "unix" - Other Unix-based OS + \li \c "windows" - Windows + \li \c "wince" - Windows CE + \endlist + \endtable +*/ + +/*! \qmlproperty object Qt::application \since QtQuick 1.1 |