diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-25 23:29:59 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-26 01:02:37 +0200 |
commit | a50c8a2573f2db63e9c83152429b4f604fc34ae9 (patch) | |
tree | 93df434c621130fab88fff4154ec7127065d7530 /src | |
parent | 78a33f71002428526da9c67bedb2567f0e9715b2 (diff) | |
parent | c0f6bdd39501aff887b39954122f74fb1e9bdc6c (diff) |
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Diffstat (limited to 'src')
-rw-r--r-- | src/qml/doc/src/whatsnew.qdoc | 5 | ||||
-rw-r--r-- | src/qml/qml/qqmlengine.cpp | 4 | ||||
-rw-r--r-- | src/qml/qml/qqmlplatform.cpp | 2 | ||||
-rw-r--r-- | src/quick/doc/src/whatsnew.qdoc | 3 | ||||
-rw-r--r-- | src/quick/items/qquickitem.h | 2 |
5 files changed, 11 insertions, 5 deletions
diff --git a/src/qml/doc/src/whatsnew.qdoc b/src/qml/doc/src/whatsnew.qdoc index eece3bcaab..f1c69160b6 100644 --- a/src/qml/doc/src/whatsnew.qdoc +++ b/src/qml/doc/src/whatsnew.qdoc @@ -37,6 +37,11 @@ a summary of the new changes: \li New QQmlApplicationEngine convenience class for QML applications. \li New Instantiatior type for generic, dynamic object creation. \li New properties for \l Qt.application: arguments, name, and version. +\li The 'with' statement has been deprecated and is slated for removal in a + future version of the language. +\li New \l Qt.platform object with an os property +\li New \l qmlClearTypeRegistations() function drops all data from qmlRegisterType calls +\li New \l qmlRegisterType function for registering composite types. \endlist \section2 New Submodule 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 diff --git a/src/qml/qml/qqmlplatform.cpp b/src/qml/qml/qqmlplatform.cpp index de48f60f56..04862379be 100644 --- a/src/qml/qml/qqmlplatform.cpp +++ b/src/qml/qml/qqmlplatform.cpp @@ -66,7 +66,7 @@ QString QQmlPlatform::os() #elif defined(Q_OS_IOS) return QLatin1String("ios"); #elif defined(Q_OS_MAC) - return QLatin1String("mac"); + return QLatin1String("osx"); #elif defined(Q_OS_WINCE) return QLatin1String("wince"); #elif defined(Q_OS_WIN) diff --git a/src/quick/doc/src/whatsnew.qdoc b/src/quick/doc/src/whatsnew.qdoc index 973d41dca2..26d88699bc 100644 --- a/src/quick/doc/src/whatsnew.qdoc +++ b/src/quick/doc/src/whatsnew.qdoc @@ -38,7 +38,8 @@ features introduced by the new import and new classes in Qt 5.1: \li New render loop for windows for smoother animations. \li New \l Window properties: activeFocusItem, minimumWidth, minimumHeight, maximumWidth, maximumHeight, visibility, contentOrientation, and opacity. -\li New \l Item property: activeFocusOnTab. +\li New \l Screen attached properties: name, desktopAvailableWidth, + desktopAvailableHeight, logicalPixelDensity \li New \l Grid properties: horizontalAlignment, verticalAlignment, and effectiveHorizontalAlignment. \li New \l TextEdit properties: selectByKeyboard and textDocument diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h index 84eafec1d7..d7256f3568 100644 --- a/src/quick/items/qquickitem.h +++ b/src/quick/items/qquickitem.h @@ -324,7 +324,7 @@ public: Q_INVOKABLE void mapToItem(QQmlV8Function*) const; Q_INVOKABLE void forceActiveFocus(); Q_INVOKABLE void forceActiveFocus(Qt::FocusReason reason); - Q_INVOKABLE QQuickItem *nextItemInFocusChain(bool forward = true); + Q_REVISION(1) Q_INVOKABLE QQuickItem *nextItemInFocusChain(bool forward = true); Q_INVOKABLE QQuickItem *childAt(qreal x, qreal y) const; #ifndef QT_NO_IM |