diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/localstorage/plugins.qmltypes | 2 | ||||
-rw-r--r-- | src/imports/particles/plugins.qmltypes | 4 | ||||
-rw-r--r-- | src/imports/qtquick2/plugins.qmltypes | 263 | ||||
-rw-r--r-- | src/imports/testlib/SignalSpy.qml | 2 | ||||
-rw-r--r-- | src/imports/testlib/TestCase.qml | 4 | ||||
-rw-r--r-- | src/imports/testlib/main.cpp | 3 | ||||
-rw-r--r-- | src/imports/testlib/plugins.qmltypes | 17 | ||||
-rw-r--r-- | src/imports/window/plugins.qmltypes | 15 | ||||
-rw-r--r-- | src/qml/debugger/qqmlinspectorservice.cpp | 1 | ||||
-rw-r--r-- | src/qml/jit/qv4isel_masm.cpp | 13 | ||||
-rw-r--r-- | src/qml/jsapi/qjsengine.cpp | 6 | ||||
-rw-r--r-- | src/qmltest/quicktestresult_p.h | 2 | ||||
-rw-r--r-- | src/quick/doc/src/qmltypereference.qdoc | 4 | ||||
-rw-r--r-- | src/quick/items/qquicktextedit_p.h | 2 | ||||
-rw-r--r-- | src/quick/items/qquicktextinput_p.h | 2 |
15 files changed, 305 insertions, 35 deletions
diff --git a/src/imports/localstorage/plugins.qmltypes b/src/imports/localstorage/plugins.qmltypes index 05bcc875f7..ff4c897f58 100644 --- a/src/imports/localstorage/plugins.qmltypes +++ b/src/imports/localstorage/plugins.qmltypes @@ -11,6 +11,8 @@ Module { name: "QQuickLocalStorage" prototype: "QObject" exports: ["QtQuick.LocalStorage/LocalStorage 2.0"] + isCreatable: false + isSingleton: true exportMetaObjectRevisions: [0] Method { name: "openDatabaseSync" diff --git a/src/imports/particles/plugins.qmltypes b/src/imports/particles/plugins.qmltypes index 712d4fd844..b1b825dea6 100644 --- a/src/imports/particles/plugins.qmltypes +++ b/src/imports/particles/plugins.qmltypes @@ -213,6 +213,7 @@ Module { name: "QQuickDirection" prototype: "QObject" exports: ["QtQuick.Particles/NullVector 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] } Component { @@ -574,6 +575,7 @@ Module { defaultProperty: "data" prototype: "QQuickItem" exports: ["QtQuick.Particles/ParticleAffector 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] Property { name: "system"; type: "QQuickParticleSystem"; isPointer: true } Property { name: "groups"; type: "QStringList" } @@ -800,6 +802,7 @@ Module { name: "QQuickParticleExtruder" prototype: "QObject" exports: ["QtQuick.Particles/ParticleExtruder 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] } Component { @@ -836,6 +839,7 @@ Module { defaultProperty: "data" prototype: "QQuickItem" exports: ["QtQuick.Particles/ParticlePainter 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] Property { name: "system"; type: "QQuickParticleSystem"; isPointer: true } Property { name: "groups"; type: "QStringList" } diff --git a/src/imports/qtquick2/plugins.qmltypes b/src/imports/qtquick2/plugins.qmltypes index dd41871e45..d98e9e6981 100644 --- a/src/imports/qtquick2/plugins.qmltypes +++ b/src/imports/qtquick2/plugins.qmltypes @@ -800,6 +800,7 @@ Module { Property { name: "role"; type: "QAccessible::Role" } Property { name: "name"; type: "string" } Property { name: "description"; type: "string" } + Property { name: "ignored"; type: "bool" } Property { name: "checkable"; type: "bool" } Property { name: "checked"; type: "bool" } Property { name: "editable"; type: "bool" } @@ -814,6 +815,7 @@ Module { Property { name: "defaultButton"; type: "bool" } Property { name: "passwordEdit"; type: "bool" } Property { name: "selectableText"; type: "bool" } + Property { name: "searchEdit"; type: "bool" } Signal { name: "checkableChanged" Parameter { name: "arg"; type: "bool" } @@ -870,8 +872,20 @@ Module { name: "selectableTextChanged" Parameter { name: "arg"; type: "bool" } } + Signal { + name: "searchEditChanged" + Parameter { name: "arg"; type: "bool" } + } + Signal { name: "pressAction" } + Signal { name: "toggleAction" } + Signal { name: "increaseAction" } + Signal { name: "decreaseAction" } Method { name: "valueChanged" } Method { name: "cursorPositionChanged" } + Method { + name: "setIgnored" + Parameter { name: "ignored"; type: "bool" } + } } Component { name: "QQuickAnchorAnimation" @@ -1367,6 +1381,7 @@ Module { Property { name: "maximumY"; type: "double" } Property { name: "active"; type: "bool"; isReadonly: true } Property { name: "filterChildren"; type: "bool" } + Property { name: "smoothed"; type: "bool" } Property { name: "threshold"; type: "double" } } Component { @@ -1632,6 +1647,61 @@ Module { Property { name: "status"; type: "Status"; isReadonly: true } } Component { + name: "QQuickFontMetrics" + prototype: "QObject" + exports: ["QtQuick/FontMetrics 2.4"] + exportMetaObjectRevisions: [0] + Property { name: "font"; type: "QFont" } + Property { name: "ascent"; type: "double"; isReadonly: true } + Property { name: "descent"; type: "double"; isReadonly: true } + Property { name: "height"; type: "double"; isReadonly: true } + Property { name: "leading"; type: "double"; isReadonly: true } + Property { name: "lineSpacing"; type: "double"; isReadonly: true } + Property { name: "minimumLeftBearing"; type: "double"; isReadonly: true } + Property { name: "minimumRightBearing"; type: "double"; isReadonly: true } + Property { name: "maximumCharacterWidth"; type: "double"; isReadonly: true } + Property { name: "xHeight"; type: "double"; isReadonly: true } + Property { name: "averageCharacterWidth"; type: "double"; isReadonly: true } + Property { name: "underlinePosition"; type: "double"; isReadonly: true } + Property { name: "overlinePosition"; type: "double"; isReadonly: true } + Property { name: "strikeOutPosition"; type: "double"; isReadonly: true } + Property { name: "lineWidth"; type: "double"; isReadonly: true } + Signal { + name: "fontChanged" + Parameter { name: "font"; type: "QFont" } + } + Method { + name: "advanceWidth" + type: "double" + Parameter { name: "text"; type: "string" } + } + Method { + name: "boundingRect" + type: "QRectF" + Parameter { name: "text"; type: "string" } + } + Method { + name: "tightBoundingRect" + type: "QRectF" + Parameter { name: "text"; type: "string" } + } + Method { + name: "elidedText" + type: "string" + Parameter { name: "text"; type: "string" } + Parameter { name: "mode"; type: "Qt::TextElideMode" } + Parameter { name: "width"; type: "double" } + Parameter { name: "flags"; type: "int" } + } + Method { + name: "elidedText" + type: "string" + Parameter { name: "text"; type: "string" } + Parameter { name: "mode"; type: "Qt::TextElideMode" } + Parameter { name: "width"; type: "double" } + } + } + Component { name: "QQuickFontValueType" prototype: "QQmlValueType" exports: ["QtQuick/Font 2.0"] @@ -1903,8 +1973,8 @@ Module { name: "QQuickItem" defaultProperty: "data" prototype: "QObject" - exports: ["QtQuick/Item 2.0", "QtQuick/Item 2.1"] - exportMetaObjectRevisions: [0, 1] + exports: ["QtQuick/Item 2.0", "QtQuick/Item 2.1", "QtQuick/Item 2.4"] + exportMetaObjectRevisions: [0, 1, 2] Enum { name: "TransformOrigin" values: { @@ -2011,6 +2081,19 @@ Module { } Method { name: "update" } Method { + name: "grabToImage" + revision: 2 + type: "bool" + Parameter { name: "callback"; type: "QJSValue" } + Parameter { name: "targetSize"; type: "QSize" } + } + Method { + name: "grabToImage" + revision: 2 + type: "bool" + Parameter { name: "callback"; type: "QJSValue" } + } + Method { name: "contains" type: "bool" Parameter { name: "point"; type: "QPointF" } @@ -2043,6 +2126,18 @@ Module { } } Component { + name: "QQuickItemGrabResult" + prototype: "QObject" + Property { name: "image"; type: "QImage"; isReadonly: true } + Property { name: "url"; type: "QUrl"; isReadonly: true } + Signal { name: "ready" } + Method { + name: "saveToFile" + type: "bool" + Parameter { name: "fileName"; type: "string" } + } + } + Component { name: "QQuickItemLayer" prototype: "QObject" Property { name: "enabled"; type: "bool" } @@ -2435,8 +2530,12 @@ Module { name: "QQuickListView" defaultProperty: "data" prototype: "QQuickItemView" - exports: ["QtQuick/ListView 2.0", "QtQuick/ListView 2.1"] - exportMetaObjectRevisions: [0, 1] + exports: [ + "QtQuick/ListView 2.0", + "QtQuick/ListView 2.1", + "QtQuick/ListView 2.4" + ] + exportMetaObjectRevisions: [0, 1, 2] attachedType: "QQuickListViewAttached" Enum { name: "Orientation" @@ -2453,6 +2552,22 @@ Module { "SnapOneItem": 2 } } + Enum { + name: "HeaderPositioning" + values: { + "InlineHeader": 0, + "OverlayHeader": 1, + "PullBackHeader": 2 + } + } + Enum { + name: "FooterPositioning" + values: { + "InlineFooter": 0, + "OverlayFooter": 1, + "PullBackFooter": 2 + } + } Property { name: "highlightMoveVelocity"; type: "double" } Property { name: "highlightResizeVelocity"; type: "double" } Property { name: "highlightResizeDuration"; type: "int" } @@ -2461,6 +2576,10 @@ Module { Property { name: "section"; type: "QQuickViewSection"; isReadonly: true; isPointer: true } Property { name: "currentSection"; type: "string"; isReadonly: true } Property { name: "snapMode"; type: "SnapMode" } + Property { name: "headerPositioning"; revision: 2; type: "HeaderPositioning" } + Property { name: "footerPositioning"; revision: 2; type: "FooterPositioning" } + Signal { name: "headerPositioningChanged"; revision: 2 } + Signal { name: "footerPositioningChanged"; revision: 2 } Method { name: "incrementCurrentIndex" } Method { name: "decrementCurrentIndex" } } @@ -2504,8 +2623,8 @@ Module { name: "QQuickMouseArea" defaultProperty: "data" prototype: "QQuickItem" - exports: ["QtQuick/MouseArea 2.0"] - exportMetaObjectRevisions: [0] + exports: ["QtQuick/MouseArea 2.0", "QtQuick/MouseArea 2.4"] + exportMetaObjectRevisions: [0, 1] Property { name: "mouseX"; type: "double"; isReadonly: true } Property { name: "mouseY"; type: "double"; isReadonly: true } Property { name: "containsMouse"; type: "bool"; isReadonly: true } @@ -2518,6 +2637,7 @@ Module { Property { name: "preventStealing"; type: "bool" } Property { name: "propagateComposedEvents"; type: "bool" } Property { name: "cursorShape"; type: "Qt::CursorShape" } + Property { name: "containsPress"; revision: 1; type: "bool"; isReadonly: true } Signal { name: "hoveredChanged" } Signal { name: "positionChanged" @@ -2558,6 +2678,7 @@ Module { Signal { name: "entered" } Signal { name: "exited" } Signal { name: "canceled" } + Signal { name: "containsPressChanged"; revision: 1 } } Component { name: "QQuickMouseEvent" @@ -2621,6 +2742,33 @@ Module { exportMetaObjectRevisions: [0] } Component { + name: "QQuickOpenGLInfo" + prototype: "QObject" + exports: ["QtQuick/OpenGLInfo 2.4"] + isCreatable: false + exportMetaObjectRevisions: [0] + Enum { + name: "ContextProfile" + values: { + "NoProfile": 0, + "CoreProfile": 1, + "CompatibilityProfile": 2 + } + } + Enum { + name: "RenderableType" + values: { + "Unspecified": 0, + "OpenGL": 1, + "OpenGLES": 2 + } + } + Property { name: "majorVersion"; type: "int"; isReadonly: true } + Property { name: "minorVersion"; type: "int"; isReadonly: true } + Property { name: "profile"; type: "ContextProfile"; isReadonly: true } + Property { name: "renderableType"; type: "RenderableType"; isReadonly: true } + } + Component { name: "QQuickPackage" defaultProperty: "data" prototype: "QObject" @@ -3226,8 +3374,8 @@ Module { name: "QQuickShaderEffect" defaultProperty: "data" prototype: "QQuickItem" - exports: ["QtQuick/ShaderEffect 2.0"] - exportMetaObjectRevisions: [0] + exports: ["QtQuick/ShaderEffect 2.0", "QtQuick/ShaderEffect 2.4"] + exportMetaObjectRevisions: [0, 1] Enum { name: "CullMode" values: { @@ -3251,6 +3399,7 @@ Module { Property { name: "cullMode"; type: "CullMode" } Property { name: "log"; type: "string"; isReadonly: true } Property { name: "status"; type: "Status"; isReadonly: true } + Property { name: "supportsAtlasTextures"; revision: 1; type: "bool" } } Component { name: "QQuickShaderEffectMesh" @@ -3983,6 +4132,13 @@ Module { Parameter { name: "text"; type: "string" } } Method { + name: "inputMethodQuery" + revision: 4 + type: "QVariant" + Parameter { name: "query"; type: "Qt::InputMethodQuery" } + Parameter { name: "argument"; type: "QVariant" } + } + Method { name: "positionToRectangle" type: "QRectF" Parameter { type: "int" } @@ -4026,8 +4182,12 @@ Module { name: "QQuickTextInput" defaultProperty: "data" prototype: "QQuickImplicitSizeItem" - exports: ["QtQuick/TextInput 2.0", "QtQuick/TextInput 2.2"] - exportMetaObjectRevisions: [0, 2] + exports: [ + "QtQuick/TextInput 2.0", + "QtQuick/TextInput 2.2", + "QtQuick/TextInput 2.4" + ] + exportMetaObjectRevisions: [0, 2, 3] Enum { name: "EchoMode" values: { @@ -4110,6 +4270,7 @@ Module { Property { name: "echoMode"; type: "EchoMode" } Property { name: "activeFocusOnPress"; type: "bool" } Property { name: "passwordCharacter"; type: "string" } + Property { name: "passwordMaskDelay"; revision: 3; type: "int" } Property { name: "displayText"; type: "string"; isReadonly: true } Property { name: "autoScroll"; type: "bool" } Property { name: "selectByMouse"; type: "bool" } @@ -4157,6 +4318,11 @@ Module { Parameter { name: "echoMode"; type: "EchoMode" } } Signal { + name: "passwordMaskDelayChanged" + revision: 3 + Parameter { name: "delay"; type: "int" } + } + Signal { name: "activeFocusOnPressChanged" Parameter { name: "activeFocusOnPress"; type: "bool" } } @@ -4203,6 +4369,11 @@ Module { Parameter { name: "end"; type: "int" } } Method { + name: "ensureVisible" + revision: 3 + Parameter { name: "position"; type: "int" } + } + Method { name: "positionAt" Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true } } @@ -4221,6 +4392,13 @@ Module { Parameter { name: "mode"; type: "SelectionMode" } } Method { + name: "inputMethodQuery" + revision: 3 + type: "QVariant" + Parameter { name: "query"; type: "Qt::InputMethodQuery" } + Parameter { name: "argument"; type: "QVariant" } + } + Method { name: "getText" type: "string" Parameter { name: "start"; type: "int" } @@ -4237,6 +4415,23 @@ Module { Property { name: "y"; type: "double" } } Component { + name: "QQuickTextMetrics" + prototype: "QObject" + exports: ["QtQuick/TextMetrics 2.4"] + exportMetaObjectRevisions: [0] + Property { name: "font"; type: "QFont" } + Property { name: "text"; type: "string" } + Property { name: "advanceWidth"; type: "double"; isReadonly: true } + Property { name: "boundingRect"; type: "QRectF"; isReadonly: true } + Property { name: "width"; type: "double"; isReadonly: true } + Property { name: "height"; type: "double"; isReadonly: true } + Property { name: "tightBoundingRect"; type: "QRectF"; isReadonly: true } + Property { name: "elidedText"; type: "string"; isReadonly: true } + Property { name: "elide"; type: "Qt::TextElideMode" } + Property { name: "elideWidth"; type: "double" } + Signal { name: "metricsChanged" } + } + Component { name: "QQuickTouchPoint" prototype: "QObject" exports: ["QtQuick/TouchPoint 2.0"] @@ -4779,7 +4974,8 @@ Module { "WA_TouchPadAcceptSingleTouchEvents": 123, "WA_X11DoNotAcceptFocus": 126, "WA_MacNoShadow": 127, - "WA_AttributeCount": 128 + "WA_AlwaysStackOnTop": 128, + "WA_AttributeCount": 129 } } Enum { @@ -4801,7 +4997,9 @@ Module { "AA_ForceRasterWidgets": 14, "AA_UseDesktopOpenGL": 15, "AA_UseOpenGLES": 16, - "AA_AttributeCount": 17 + "AA_UseSoftwareOpenGL": 17, + "AA_ShareOpenGLContexts": 18, + "AA_AttributeCount": 19 } } Enum { @@ -5246,6 +5444,13 @@ Module { "Key_Guide": 16777498, "Key_Info": 16777499, "Key_Settings": 16777500, + "Key_MicVolumeUp": 16777501, + "Key_MicVolumeDown": 16777502, + "Key_New": 16777504, + "Key_Open": 16777505, + "Key_Find": 16777506, + "Key_Undo": 16777507, + "Key_Redo": 16777508, "Key_MediaLast": 16842751, "Key_Select": 16842752, "Key_Yes": 16842753, @@ -5582,6 +5787,20 @@ Module { } } Enum { + name: "FocusReason" + values: { + "MouseFocusReason": 0, + "TabFocusReason": 1, + "BacktabFocusReason": 2, + "ActiveWindowFocusReason": 3, + "PopupFocusReason": 4, + "ShortcutFocusReason": 5, + "MenuBarFocusReason": 6, + "OtherFocusReason": 7, + "NoFocusReason": 8 + } + } + Enum { name: "ContextMenuPolicy" values: { "NoContextMenu": 0, @@ -5831,6 +6050,18 @@ Module { } } Enum { + name: "NativeGestureType" + values: { + "BeginNativeGesture": 0, + "EndNativeGesture": 1, + "PanNativeGesture": 2, + "ZoomNativeGesture": 3, + "SmartZoomNativeGesture": 4, + "RotateNativeGesture": 5, + "SwipeNativeGesture": 6 + } + } + Enum { name: "CursorMoveStyle" values: { "LogicalMoveStyle": 0, @@ -5853,6 +6084,14 @@ Module { "ScrollEnd": 3 } } + Enum { + name: "MouseEventSource" + values: { + "MouseEventNotSynthesized": 0, + "MouseEventSynthesizedBySystem": 1, + "MouseEventSynthesizedByQt": 2 + } + } } Component { name: "QEasingCurve"; prototype: "QQmlEasingValueType" } } diff --git a/src/imports/testlib/SignalSpy.qml b/src/imports/testlib/SignalSpy.qml index 547f403bab..e483e6f71f 100644 --- a/src/imports/testlib/SignalSpy.qml +++ b/src/imports/testlib/SignalSpy.qml @@ -32,7 +32,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtTest 1.0 +import QtTest 1.1 /*! \qmltype SignalSpy diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml index 700c9112eb..160e0bdb62 100644 --- a/src/imports/testlib/TestCase.qml +++ b/src/imports/testlib/TestCase.qml @@ -32,7 +32,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtTest 1.0 +import QtTest 1.1 import "testlogger.js" as TestLogger import Qt.test.qtestroot 1.0 @@ -101,7 +101,7 @@ import Qt.test.qtestroot 1.0 \code import QtQuick 2.0 - import QtTest 1.0 + import QtTest 1.1 TestCase { name: "DataTests" diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp index 59002ba09b..6e28101530 100644 --- a/src/imports/testlib/main.cpp +++ b/src/imports/testlib/main.cpp @@ -140,7 +140,8 @@ public: virtual void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtTest")); - qmlRegisterType<QuickTestResult>(uri,1,0,"TestResult"); + qmlRegisterType<QuickTestResult, 0>(uri,1,0,"TestResult"); + qmlRegisterType<QuickTestResult, 1>(uri,1,1,"TestResult"); qmlRegisterType<QuickTestEvent>(uri,1,0,"TestEvent"); qmlRegisterType<QuickTestUtil>(uri,1,0,"TestUtil"); } diff --git a/src/imports/testlib/plugins.qmltypes b/src/imports/testlib/plugins.qmltypes index 94203df4dc..a892f73eb0 100644 --- a/src/imports/testlib/plugins.qmltypes +++ b/src/imports/testlib/plugins.qmltypes @@ -4,13 +4,13 @@ import QtQuick.tooling 1.1 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtTest 1.0' +// 'qmlplugindump QtTest 1.1' Module { Component { name: "QuickTestEvent" prototype: "QObject" - exports: ["QtTest/TestEvent 1.0"] + exports: ["TestEvent 1.0"] exportMetaObjectRevisions: [0] Method { name: "keyPress" @@ -119,8 +119,8 @@ Module { Component { name: "QuickTestResult" prototype: "QObject" - exports: ["QtTest/TestResult 1.0"] - exportMetaObjectRevisions: [0] + exports: ["TestResult 1.0", "TestResult 1.1"] + exportMetaObjectRevisions: [0, 1] Enum { name: "RunMode" values: { @@ -250,11 +250,18 @@ Module { type: "QObject*" Parameter { name: "item"; type: "QQuickItem"; isPointer: true } } + Method { + name: "findChild" + revision: 1 + type: "QObject*" + Parameter { name: "parent"; type: "QObject"; isPointer: true } + Parameter { name: "objectName"; type: "string" } + } } Component { name: "QuickTestUtil" prototype: "QObject" - exports: ["QtTest/TestUtil 1.0"] + exports: ["TestUtil 1.0"] exportMetaObjectRevisions: [0] Property { name: "printAvailableFunctions"; type: "bool"; isReadonly: true } Property { name: "dragThreshold"; type: "int"; isReadonly: true } diff --git a/src/imports/window/plugins.qmltypes b/src/imports/window/plugins.qmltypes index 27c0299c32..fa320886db 100644 --- a/src/imports/window/plugins.qmltypes +++ b/src/imports/window/plugins.qmltypes @@ -38,8 +38,10 @@ Module { Property { name: "desktopAvailableHeight"; type: "int"; isReadonly: true } Property { name: "logicalPixelDensity"; type: "double"; isReadonly: true } Property { name: "pixelDensity"; type: "double"; isReadonly: true } + Property { name: "devicePixelRatio"; type: "double"; isReadonly: true } Property { name: "primaryOrientation"; type: "Qt::ScreenOrientation"; isReadonly: true } Property { name: "orientation"; type: "Qt::ScreenOrientation"; isReadonly: true } + Property { name: "orientationUpdateMask"; type: "Qt::ScreenOrientations" } Signal { name: "desktopGeometryChanged" } Method { name: "angleBetween" @@ -104,11 +106,20 @@ Module { Method { name: "releaseResources" } } Component { + name: "QQuickWindowAttached" + prototype: "QObject" + Property { name: "visibility"; type: "QWindow::Visibility"; isReadonly: true } + Property { name: "active"; type: "bool"; isReadonly: true } + Property { name: "activeFocusItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + } + Component { name: "QQuickWindowQmlImpl" defaultProperty: "data" prototype: "QQuickWindow" - exports: ["QtQuick.Window/Window 2.1"] - exportMetaObjectRevisions: [0] + exports: ["QtQuick.Window/Window 2.1", "QtQuick.Window/Window 2.2"] + exportMetaObjectRevisions: [0, 1] + attachedType: "QQuickWindowAttached" Property { name: "visible"; type: "bool" } Property { name: "visibility"; type: "Visibility" } Signal { diff --git a/src/qml/debugger/qqmlinspectorservice.cpp b/src/qml/debugger/qqmlinspectorservice.cpp index 31fa9bddef..89c2c17c45 100644 --- a/src/qml/debugger/qqmlinspectorservice.cpp +++ b/src/qml/debugger/qqmlinspectorservice.cpp @@ -106,6 +106,7 @@ void QQmlInspectorService::updateState() return; } + m_currentInspectorPlugin = 0; foreach (QQmlInspectorInterface *inspector, m_inspectorPlugins) { if (inspector->canHandleView(m_views.first())) { m_currentInspectorPlugin = inspector; diff --git a/src/qml/jit/qv4isel_masm.cpp b/src/qml/jit/qv4isel_masm.cpp index 9ff33feff2..f4a1ec5f69 100644 --- a/src/qml/jit/qv4isel_masm.cpp +++ b/src/qml/jit/qv4isel_masm.cpp @@ -1530,16 +1530,15 @@ void InstructionSelection::calculateRegistersToSave(const RegisterInformation &u fpRegistersToSave.clear(); foreach (const RegisterInfo &ri, Assembler::getRegisterInfo()) { +#if defined(RESTORE_EBX_ON_CALL) + if (ri.isRegularRegister() && ri.reg<JSC::X86Registers::RegisterID>() == JSC::X86Registers::ebx) { + regularRegistersToSave.append(ri); + continue; + } +#endif // RESTORE_EBX_ON_CALL if (ri.isCallerSaved()) continue; - if (ri.isRegularRegister()) { -#if defined(RESTORE_EBX_ON_CALL) - if (ri.isRegularRegister() && ri.reg<JSC::X86Registers::RegisterID>() == JSC::X86Registers::ebx) { - regularRegistersToSave.append(ri); - continue; - } -#endif // RESTORE_EBX_ON_CALL if (ri.isPredefined() || used.contains(ri)) regularRegistersToSave.append(ri); } else { diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp index 0d2b394cd6..d7f45b56e0 100644 --- a/src/qml/jsapi/qjsengine.cpp +++ b/src/qml/jsapi/qjsengine.cpp @@ -243,6 +243,8 @@ void QJSEngine::collectGarbage() \row \li QT_TRID_NOOP() \li QT_TRID_NOOP() \endtable + It also adds an arg() method to the string prototype. + \sa {Internationalization with Qt} */ void QJSEngine::installTranslatorFunctions(const QJSValue &object) @@ -260,6 +262,10 @@ void QJSEngine::installTranslatorFunctions(const QJSValue &object) obj->defineDefaultProperty(QStringLiteral("QT_TR_NOOP"), QV4::GlobalExtensions::method_qsTrNoOp); obj->defineDefaultProperty(QStringLiteral("qsTrId"), QV4::GlobalExtensions::method_qsTrId); obj->defineDefaultProperty(QStringLiteral("QT_TRID_NOOP"), QV4::GlobalExtensions::method_qsTrIdNoOp); + + // string prototype extension + v4->stringObjectClass->prototype->defineDefaultProperty(QStringLiteral("arg"), + QV4::GlobalExtensions::method_string_arg); #endif } diff --git a/src/qmltest/quicktestresult_p.h b/src/qmltest/quicktestresult_p.h index 78d0501b7c..0da29e8bd4 100644 --- a/src/qmltest/quicktestresult_p.h +++ b/src/qmltest/quicktestresult_p.h @@ -139,7 +139,7 @@ public Q_SLOTS: QObject *grabImage(QQuickItem *item); - QObject *findChild(QObject *parent, const QString &objectName); + Q_REVISION(1) QObject *findChild(QObject *parent, const QString &objectName); public: // Helper functions for the C++ main() shell. diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc index cc602d4aee..430c0ed11a 100644 --- a/src/quick/doc/src/qmltypereference.qdoc +++ b/src/quick/doc/src/qmltypereference.qdoc @@ -830,14 +830,14 @@ console.log(c + " " + d); // false true */ /*! -\qmlmodule QtTest 1.0 +\qmlmodule QtTest 1.1 \title Qt Quick Test QML Types \brief This module provides QML types to unit test your QML application \ingroup qmlmodules You can import this module using the following statement: \code -import QtTest 1.0 +import QtTest 1.1 \endcode For more information about how to use these types, see diff --git a/src/quick/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h index 5d1c026c5c..da88fd4917 100644 --- a/src/quick/items/qquicktextedit_p.h +++ b/src/quick/items/qquicktextedit_p.h @@ -221,7 +221,7 @@ public: #ifndef QT_NO_IM QVariant inputMethodQuery(Qt::InputMethodQuery property) const; - Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery query, QVariant argument) const; + Q_REVISION(4) Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery query, QVariant argument) const; #endif qreal contentWidth() const; diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h index 2386fc5642..34b0c81495 100644 --- a/src/quick/items/qquicktextinput_p.h +++ b/src/quick/items/qquicktextinput_p.h @@ -246,7 +246,7 @@ public: #ifndef QT_NO_IM QVariant inputMethodQuery(Qt::InputMethodQuery property) const; - Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery query, QVariant argument) const; + Q_REVISION(3) Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery query, QVariant argument) const; #endif QRectF boundingRect() const; |