diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-11 01:00:07 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-11 01:00:07 +0100 |
| commit | 9bd034ea01d01dcc4598c3e3e25e91d0b53a2cda (patch) | |
| tree | 5b7ca3a1477b0d7733a16abcecf85043a88c442d | |
| parent | 707f78086982f15dc4b2d6129f0b983d01cb9626 (diff) | |
| parent | 1d79bef288623fca8c7cc3fc2c49860b6e2abedb (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I0d32fc5b99f8c9e4acb922fffe4dd5f3c5be553c
36 files changed, 10 insertions, 270 deletions
diff --git a/examples/quick/scenegraph/rendernode/softwarerenderer.cpp b/examples/quick/scenegraph/rendernode/softwarerenderer.cpp index a0f288d575..d6d97a8151 100644 --- a/examples/quick/scenegraph/rendernode/softwarerenderer.cpp +++ b/examples/quick/scenegraph/rendernode/softwarerenderer.cpp @@ -53,6 +53,7 @@ #include <QQuickWindow> #include <QSGRendererInterface> #include <QPainter> +#include <QPainterPath> SoftwareRenderNode::~SoftwareRenderNode() { diff --git a/src/imports/statemachine/signaltransition.cpp b/src/imports/statemachine/signaltransition.cpp index 468f2020c7..69edaa4e48 100644 --- a/src/imports/statemachine/signaltransition.cpp +++ b/src/imports/statemachine/signaltransition.cpp @@ -268,8 +268,6 @@ void SignalTransitionParser::applyBindings( \qmlsignal QAbstractTransition::triggered() This signal is emitted when the transition has been triggered. - - The corresponding handler is \c onTriggered. */ /*! diff --git a/src/imports/statemachine/state.cpp b/src/imports/statemachine/state.cpp index 10530c2985..ff0f55f197 100644 --- a/src/imports/statemachine/state.cpp +++ b/src/imports/statemachine/state.cpp @@ -97,8 +97,6 @@ QQmlListProperty<QObject> State::children() This signal is emitted when the State becomes active. - The corresponding handler is \c onEntered. - \sa active, exited */ @@ -107,8 +105,6 @@ QQmlListProperty<QObject> State::children() This signal is emitted when the State becomes inactive. - The corresponding handler is \c onExited. - \sa active, entered */ @@ -121,7 +117,6 @@ QQmlListProperty<QObject> State::children() \brief Provides a general-purpose state for StateMachine. - State objects can have child states as well as transitions to other states. State is part of \l{The Declarative State Machine Framework}. @@ -180,8 +175,6 @@ QQmlListProperty<QObject> State::children() This signal is emitted when a final child state of this state is entered. - The corresponding handler is \c onFinished. - \sa QAbstractState::active, QAbstractState::entered, QAbstractState::exited */ diff --git a/src/imports/statemachine/statemachine.cpp b/src/imports/statemachine/statemachine.cpp index bdad2e6bde..de6c84227d 100644 --- a/src/imports/statemachine/statemachine.cpp +++ b/src/imports/statemachine/statemachine.cpp @@ -211,8 +211,6 @@ QQmlListProperty<QObject> StateMachine::children() This signal is emitted when the state machine has entered its initial state (State::initialState). - The corresponding handler is \c onStarted. - \sa running, start(), State::finished */ @@ -230,8 +228,6 @@ QQmlListProperty<QObject> StateMachine::children() This signal is emitted when the state machine has stopped. - The corresponding handler is \c onStopped. - \sa running, stop(), State::finished */ diff --git a/src/particles/qquickcustomaffector.cpp b/src/particles/qquickcustomaffector.cpp index 5e2133dfaf..aa2617e64c 100644 --- a/src/particles/qquickcustomaffector.cpp +++ b/src/particles/qquickcustomaffector.cpp @@ -57,8 +57,6 @@ QT_BEGIN_NAMESPACE Note that JavaScript is slower to execute, so it is not recommended to use this in high-volume particle systems. - - The corresponding handler is \c onAffectParticles. */ /*! diff --git a/src/particles/qquickparticleaffector.cpp b/src/particles/qquickparticleaffector.cpp index ffbd5674f0..3e3346997e 100644 --- a/src/particles/qquickparticleaffector.cpp +++ b/src/particles/qquickparticleaffector.cpp @@ -126,8 +126,6 @@ QT_BEGIN_NAMESPACE signal with a high-volume particle system. (\a {x}, \a {y}) is the particle's current position. - - The corresponding handler is \c onAffected. */ QQuickParticleAffector::QQuickParticleAffector(QQuickItem *parent) : QQuickItem(parent), m_needsReset(false), m_ignoresTime(false), m_onceOff(false), m_enabled(true) diff --git a/src/particles/qquickparticleemitter.cpp b/src/particles/qquickparticleemitter.cpp index c0d9fa941d..3e9d7c02a9 100644 --- a/src/particles/qquickparticleemitter.cpp +++ b/src/particles/qquickparticleemitter.cpp @@ -196,8 +196,6 @@ QT_BEGIN_NAMESPACE \note JavaScript is slower to execute, so it is not recommended to use this in high-volume particle systems. - - The corresponding handler is \c onEmitParticles. */ /*! \qmlmethod QtQuick.Particles::Emitter::burst(int count) diff --git a/src/particles/qquicktrailemitter.cpp b/src/particles/qquicktrailemitter.cpp index 102dc7bd2e..5720460bae 100644 --- a/src/particles/qquicktrailemitter.cpp +++ b/src/particles/qquicktrailemitter.cpp @@ -123,7 +123,7 @@ QQuickTrailEmitter::QQuickTrailEmitter(QQuickItem *parent) : This signal is emitted when particles are emitted from the \a followed particle. \a particles contains an array of particle objects which can be directly manipulated. - The corresponding handler is \c onEmitFollowParticles. If you use this signal handler, emitParticles will not be emitted. + If you use this signal handler, emitParticles will not be emitted. */ bool QQuickTrailEmitter::isEmitFollowConnected() diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index ede2816d5f..9ee4fdbe41 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -249,9 +249,8 @@ V4_DEFINE_EXTENSION(QQmlComponentExtension, componentExtension); execute script code at startup, once the full QML environment has been established. - The corresponding handler is \c onCompleted. It can be declared on - any object. The order of running the \c onCompleted handlers is - undefined. + The \c onCompleted signal handler can be declared on any object. The order + of running the handlers is undefined. \qml Rectangle { @@ -270,9 +269,8 @@ V4_DEFINE_EXTENSION(QQmlComponentExtension, componentExtension); work done in response to the \l {completed}{completed()} signal, or other imperative code in your application. - The corresponding handler is \c onDestruction. It can be declared on - any object. The order of running the \c onDestruction handlers is - undefined. + The \c onDestruction signal handler can be declared on any object. The + order of running the handlers is undefined. \qml Rectangle { diff --git a/src/qml/types/qqmltimer.cpp b/src/qml/types/qqmltimer.cpp index af2ff56f2a..bf2c414cb4 100644 --- a/src/qml/types/qqmltimer.cpp +++ b/src/qml/types/qqmltimer.cpp @@ -313,8 +313,6 @@ void QQmlTimer::componentComplete() \qmlsignal QtQml::Timer::triggered() This signal is emitted when the Timer times out. - - The corresponding handler is \c onTriggered. */ void QQmlTimer::ticked() { diff --git a/src/qmlmodels/qqmldelegatemodel.cpp b/src/qmlmodels/qqmldelegatemodel.cpp index 3a05bf1689..095b66b379 100644 --- a/src/qmlmodels/qqmldelegatemodel.cpp +++ b/src/qmlmodels/qqmldelegatemodel.cpp @@ -3392,8 +3392,6 @@ void QQmlDelegateModelGroup::move(QQmlV4Function *args) Each index is adjusted for previous changes with all removed items preceding any inserted items. - - The corresponding handler is \c onChanged. */ //============================================================================ diff --git a/src/qmlmodels/qqmlinstantiator.cpp b/src/qmlmodels/qqmlinstantiator.cpp index f9d5762f6e..3a0d746eb6 100644 --- a/src/qmlmodels/qqmlinstantiator.cpp +++ b/src/qmlmodels/qqmlinstantiator.cpp @@ -250,8 +250,6 @@ QQmlInstantiator::~QQmlInstantiator() This signal is emitted when an object is added to the Instantiator. The \a index parameter holds the index which the object has been given, and the \a object parameter holds the \l QtObject that has been added. - - The corresponding handler is \c onObjectAdded. */ /*! @@ -263,8 +261,6 @@ QQmlInstantiator::~QQmlInstantiator() Do not keep a reference to \a object if it was created by this Instantiator, as in these cases it will be deleted shortly after the signal is handled. - - The corresponding handler is \c onObjectRemoved. */ /*! \qmlproperty bool QtQml::Instantiator::active diff --git a/src/qmlworkerscript/qquickworkerscript.cpp b/src/qmlworkerscript/qquickworkerscript.cpp index 0bdbbabadc..20294d7ba7 100644 --- a/src/qmlworkerscript/qquickworkerscript.cpp +++ b/src/qmlworkerscript/qquickworkerscript.cpp @@ -636,8 +636,6 @@ void QQuickWorkerScript::componentComplete() This signal is emitted when a message \a msg is received from a worker script in another thread through a call to sendMessage(). - - The corresponding handler is \c onMessage. */ bool QQuickWorkerScript::event(QEvent *event) diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp index b8e6d58af4..bfee190baf 100644 --- a/src/quick/items/context2d/qquickcanvasitem.cpp +++ b/src/quick/items/context2d/qquickcanvasitem.cpp @@ -1019,8 +1019,6 @@ QQmlRefPointer<QQuickCanvasPixmap> QQuickCanvasItem::loadedPixmap(const QUrl& ur This signal is emitted when an image has been loaded. - The corresponding handler is \c onImageLoaded. - \sa loadImage() */ @@ -1244,8 +1242,6 @@ QRect QQuickCanvasItem::tiledRect(const QRectF &window, const QSize &tileSize) This signal can be triggered by markdirty(), requestPaint() or by changing the current canvas window. - - The corresponding handler is \c onPaint. */ /*! @@ -1253,8 +1249,6 @@ QRect QQuickCanvasItem::tiledRect(const QRectF &window, const QSize &tileSize) This signal is emitted after all context painting commands are executed and the Canvas has been rendered. - - The corresponding handler is \c onPainted. */ QT_END_NAMESPACE diff --git a/src/quick/items/qquickaccessibleattached.cpp b/src/quick/items/qquickaccessibleattached.cpp index 2da01e9151..ae23c4c07e 100644 --- a/src/quick/items/qquickaccessibleattached.cpp +++ b/src/quick/items/qquickaccessibleattached.cpp @@ -273,71 +273,51 @@ QT_BEGIN_NAMESPACE \qmlsignal QtQuick::Accessible::pressAction() This signal is emitted when a press action is received from an assistive tool such as a screen-reader. - - The corresponding handler is \c onPressAction. */ /*! \qmlsignal QtQuick::Accessible::toggleAction() This signal is emitted when a toggle action is received from an assistive tool such as a screen-reader. - - The corresponding handler is \c onToggleAction. */ /*! \qmlsignal QtQuick::Accessible::increaseAction() This signal is emitted when a increase action is received from an assistive tool such as a screen-reader. - - The corresponding handler is \c onIncreaseAction. */ /*! \qmlsignal QtQuick::Accessible::decreaseAction() This signal is emitted when a decrease action is received from an assistive tool such as a screen-reader. - - The corresponding handler is \c onDecreaseAction. */ /*! \qmlsignal QtQuick::Accessible::scrollUpAction() This signal is emitted when a scroll up action is received from an assistive tool such as a screen-reader. - - The corresponding handler is \c onScrollUpAction. */ /*! \qmlsignal QtQuick::Accessible::scrollDownAction() This signal is emitted when a scroll down action is received from an assistive tool such as a screen-reader. - - The corresponding handler is \c onScrollDownAction. */ /*! \qmlsignal QtQuick::Accessible::scrollLeftAction() This signal is emitted when a scroll left action is received from an assistive tool such as a screen-reader. - - The corresponding handler is \c onScrollLeftAction. */ /*! \qmlsignal QtQuick::Accessible::scrollRightAction() This signal is emitted when a scroll right action is received from an assistive tool such as a screen-reader. - - The corresponding handler is \c onScrollRightAction. */ /*! \qmlsignal QtQuick::Accessible::previousPageAction() This signal is emitted when a previous page action is received from an assistive tool such as a screen-reader. - - The corresponding handler is \c onPreviousPageAction. */ /*! \qmlsignal QtQuick::Accessible::nextPageAction() This signal is emitted when a next page action is received from an assistive tool such as a screen-reader. - - The corresponding handler is \c onNextPageAction. */ QMetaMethod QQuickAccessibleAttached::sigPress; diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp index 117daef924..3f32fc5243 100644 --- a/src/quick/items/qquickdrag.cpp +++ b/src/quick/items/qquickdrag.cpp @@ -745,8 +745,6 @@ void QQuickDragAttached::cancel() This signal is emitted when a drag is started with the \l startDrag() method or when it is started automatically using the \l dragType property. - - The corresponding handler is \c onDragStarted. */ /*! @@ -757,8 +755,6 @@ void QQuickDragAttached::cancel() \a dropAction holds the action accepted by the target item. - The corresponding handler is \c onDragFinished. - \sa drop() */ diff --git a/src/quick/items/qquickdroparea.cpp b/src/quick/items/qquickdroparea.cpp index 76be8cc261..d90ee209d6 100644 --- a/src/quick/items/qquickdroparea.cpp +++ b/src/quick/items/qquickdroparea.cpp @@ -212,8 +212,6 @@ qreal QQuickDropAreaDrag::y() const \qmlsignal QtQuick::DropArea::positionChanged(DragEvent drag) This signal is emitted when the position of a \a drag has changed. - - The corresponding handler is \c onPositionChanged. */ void QQuickDropArea::dragMoveEvent(QDragMoveEvent *event) @@ -254,8 +252,6 @@ QStringList QQuickDropAreaPrivate::getKeys(const QMimeData *mimeData) const \qmlsignal QtQuick::DropArea::entered(DragEvent drag) This signal is emitted when a \a drag enters the bounds of a DropArea. - - The corresponding handler is \c onEntered. */ void QQuickDropArea::dragEnterEvent(QDragEnterEvent *event) @@ -291,8 +287,6 @@ void QQuickDropArea::dragEnterEvent(QDragEnterEvent *event) \qmlsignal QtQuick::DropArea::exited() This signal is emitted when a drag exits the bounds of a DropArea. - - The corresponding handler is \c onExited. */ void QQuickDropArea::dragLeaveEvent(QDragLeaveEvent *) @@ -315,8 +309,6 @@ void QQuickDropArea::dragLeaveEvent(QDragLeaveEvent *) This signal is emitted when a \a drop event occurs within the bounds of a DropArea. - - The corresponding handler is \c onDropped. */ void QQuickDropArea::dropEvent(QDropEvent *event) diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index 27c57e147a..c7f641cf1f 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -591,8 +591,6 @@ void QQuickFlickablePrivate::updateBeginningEnd() This signal is emitted when the view starts to be dragged due to user interaction. - - The corresponding handler is \c onDragStarted. */ /*! @@ -602,8 +600,6 @@ void QQuickFlickablePrivate::updateBeginningEnd() If the velocity of the drag is sufficient at the time the touch/mouse button is released then a flick will start. - - The corresponding handler is \c onDragEnded. */ /*! @@ -689,8 +685,6 @@ void QQuickFlickablePrivate::updateBeginningEnd() This signal is emitted when the view begins moving due to user interaction or a generated flick(). - - The corresponding handler is \c onMovementStarted. */ /*! @@ -701,8 +695,6 @@ void QQuickFlickablePrivate::updateBeginningEnd() be emitted once the flick stops. If a flick was not active, this signal will be emitted when the user stops dragging - i.e. a mouse or touch release. - - The corresponding handler is \c onMovementEnded. */ /*! @@ -711,16 +703,12 @@ void QQuickFlickablePrivate::updateBeginningEnd() This signal is emitted when the view is flicked. A flick starts from the point that the mouse or touch is released, while still in motion. - - The corresponding handler is \c onFlickStarted. */ /*! \qmlsignal QtQuick::Flickable::flickEnded() This signal is emitted when the view stops moving due to a flick. - - The corresponding handler is \c onFlickEnded. */ /*! diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp index 5f6c194bcf..7ca5b0c34c 100644 --- a/src/quick/items/qquickgridview.cpp +++ b/src/quick/items/qquickgridview.cpp @@ -1298,8 +1298,6 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight) /*! \qmlattachedsignal QtQuick::GridView::add() This attached signal is emitted immediately after an item is added to the view. - - The corresponding handler is \c onAdd. */ /*! @@ -1308,8 +1306,6 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight) If a \l remove transition has been specified, it is applied after this signal is handled, providing that \l delayRemove is false. - - The corresponding handler is \c onRemove. */ diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 4d9e3de859..4b635ac7b8 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -939,8 +939,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when a key has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onPressed. */ /*! @@ -948,8 +946,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when a key has been released. The \a event parameter provides information about the event. - - The corresponding handler is \c onReleased. */ /*! @@ -987,8 +983,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const As with the other signals, \c shortcutOverride will only be emitted for an item if that item has \l {Item::}{activeFocus}. - The corresponding handler is \c onShortcutOverride. - \sa Shortcut */ @@ -997,8 +991,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the digit '0' has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onDigit0Pressed. */ /*! @@ -1006,8 +998,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the digit '1' has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onDigit1Pressed. */ /*! @@ -1015,8 +1005,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the digit '2' has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onDigit2Pressed. */ /*! @@ -1024,8 +1012,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the digit '3' has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onDigit3Pressed. */ /*! @@ -1033,8 +1019,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the digit '4' has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onDigit4Pressed. */ /*! @@ -1042,8 +1026,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the digit '5' has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onDigit5Pressed. */ /*! @@ -1051,8 +1033,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the digit '6' has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onDigit6Pressed. */ /*! @@ -1060,8 +1040,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the digit '7' has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onDigit7Pressed. */ /*! @@ -1069,8 +1047,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the digit '8' has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onDigit8Pressed. */ /*! @@ -1078,8 +1054,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the digit '9' has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onDigit9Pressed. */ /*! @@ -1087,8 +1061,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the Left arrow has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onLeftPressed. */ /*! @@ -1096,8 +1068,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the Right arrow has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onRightPressed. */ /*! @@ -1105,8 +1075,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the Up arrow has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onUpPressed. */ /*! @@ -1114,8 +1082,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the Down arrow has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onDownPressed. */ /*! @@ -1123,8 +1089,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the Tab key has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onTabPressed. */ /*! @@ -1132,8 +1096,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the Shift+Tab key combination (Backtab) has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onBacktabPressed. */ /*! @@ -1141,8 +1103,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the Asterisk '*' has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onAsteriskPressed. */ /*! @@ -1150,8 +1110,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the Escape key has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onEscapePressed. */ /*! @@ -1159,8 +1117,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the Return key has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onReturnPressed. */ /*! @@ -1168,8 +1124,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the Enter key has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onEnterPressed. */ /*! @@ -1177,8 +1131,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the Delete key has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onDeletePressed. */ /*! @@ -1186,8 +1138,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the Space key has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onSpacePressed. */ /*! @@ -1195,8 +1145,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the Back key has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onBackPressed. */ /*! @@ -1204,8 +1152,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the Cancel key has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onCancelPressed. */ /*! @@ -1213,8 +1159,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the Select key has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onSelectPressed. */ /*! @@ -1222,8 +1166,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the Yes key has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onYesPressed. */ /*! @@ -1231,8 +1173,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the No key has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onNoPressed. */ /*! @@ -1240,8 +1180,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the Context1 key has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onContext1Pressed. */ /*! @@ -1249,8 +1187,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the Context2 key has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onContext2Pressed. */ /*! @@ -1258,8 +1194,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the Context3 key has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onContext3Pressed. */ /*! @@ -1267,8 +1201,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the Context4 key has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onContext4Pressed. */ /*! @@ -1276,8 +1208,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the Call key has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onCallPressed. */ /*! @@ -1285,8 +1215,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the Hangup key has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onHangupPressed. */ /*! @@ -1294,8 +1222,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the Flip key has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onFlipPressed. */ /*! @@ -1303,8 +1229,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the Menu key has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onMenuPressed. */ /*! @@ -1312,8 +1236,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the VolumeUp key has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onVolumeUpPressed. */ /*! @@ -1321,8 +1243,6 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const This signal is emitted when the VolumeDown key has been pressed. The \a event parameter provides information about the event. - - The corresponding handler is \c onVolumeDownPressed. */ QQuickKeysAttached::QQuickKeysAttached(QObject *parent) diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp index b91e705ad0..cf63b6229b 100644 --- a/src/quick/items/qquicklistview.cpp +++ b/src/quick/items/qquicklistview.cpp @@ -2178,8 +2178,6 @@ QQuickListView::~QQuickListView() If an \l add transition is specified, it is applied immediately after this signal is handled. - - The corresponding handler is \c onAdd. */ /*! @@ -2188,8 +2186,6 @@ QQuickListView::~QQuickListView() If a \l remove transition has been specified, it is applied after this signal is handled, providing that \l delayRemove is false. - - The corresponding handler is \c onRemove. */ /*! diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp index 1fb71272b1..e1d533f092 100644 --- a/src/quick/items/qquickloader.cpp +++ b/src/quick/items/qquickloader.cpp @@ -823,8 +823,6 @@ void QQuickLoader::itemChange(QQuickItem::ItemChange change, const QQuickItem::I This signal is emitted when the \l status becomes \c Loader.Ready, or on successful initial load. - - The corresponding handler is \c onLoaded. */ diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp index 57d55172e3..fd2458494c 100644 --- a/src/quick/items/qquickmousearea.cpp +++ b/src/quick/items/qquickmousearea.cpp @@ -275,8 +275,6 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i even when no mouse button is pressed. \sa hoverEnabled - - The corresponding handler is \c onEntered. */ /*! @@ -315,8 +313,6 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i both be considered to be simultaneously hovered. \sa hoverEnabled - - The corresponding handler is \c onExited. */ /*! @@ -333,8 +329,6 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i When handling this signal, changing the \l {MouseEvent::}{accepted} property of the \a mouse parameter has no effect. - - The corresponding handler is \c onPositionChanged. */ /*! @@ -349,8 +343,6 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i When handling this signal, changing the \l {MouseEvent::}{accepted} property of the \a mouse parameter has no effect, unless the \l propagateComposedEvents property is \c true. - - The corresponding handler is \c onClicked. */ /*! @@ -365,8 +357,6 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i release. The default is to accept the event and not allow other MouseAreas beneath this one to handle the event. If \e accepted is set to false, no further events will be sent to this MouseArea until the button is next pressed. - - The corresponding handler is \c onPressed. */ /*! @@ -379,8 +369,6 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i When handling this signal, changing the \l {MouseEvent::}{accepted} property of the \a mouse parameter has no effect. - The corresponding handler is \c onReleased. - \sa canceled */ @@ -393,8 +381,6 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i When handling this signal, changing the \l {MouseEvent::}{accepted} property of the \a mouse parameter has no effect, unless the \l propagateComposedEvents property is \c true. - - The corresponding handler is \c onPressAndHold. */ /*! @@ -407,8 +393,6 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i When handling this signal, if the \l {MouseEvent::}{accepted} property of the \a mouse parameter is set to false, the pressed/released/clicked signals will be emitted for the second click; otherwise they are suppressed. The \c accepted property defaults to true. - - The corresponding handler is \c onDoubleClicked. */ /*! @@ -422,8 +406,6 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i \l Flickable will steal the mouse handling from the MouseArea. In these cases, to reset the logic when the MouseArea has lost the mouse handling to the \l Flickable, \c canceled should be handled in addition to \l released. - - The corresponding handler is \c onCanceled. */ /*! @@ -434,8 +416,6 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i The \a wheel parameter provides information about the event, including the x and y position, any buttons currently pressed, and information about the wheel movement, including angleDelta and pixelDelta. - - The corresponding handler is \c onWheel. */ QQuickMouseArea::QQuickMouseArea(QQuickItem *parent) diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp index 3a807d3c66..a854d97f7e 100644 --- a/src/quick/items/qquickmultipointtoucharea.cpp +++ b/src/quick/items/qquickmultipointtoucharea.cpp @@ -363,24 +363,18 @@ void QQuickTouchPoint::setUniqueId(const QPointingDeviceUniqueId &id) If minimumTouchPoints is set to a value greater than one, this signal will not be emitted until the minimum number of required touch points has been reached. - - The corresponding handler is \c onPressed. */ /*! \qmlsignal QtQuick::MultiPointTouchArea::updated(list<TouchPoint> touchPoints) This signal is emitted when existing touch points are updated. \a touchPoints is a list of these updated points. - - The corresponding handler is \c onUpdated. */ /*! \qmlsignal QtQuick::MultiPointTouchArea::released(list<TouchPoint> touchPoints) This signal is emitted when existing touch points are removed. \a touchPoints is a list of these removed points. - - The corresponding handler is \c onReleased. */ /*! @@ -396,8 +390,6 @@ void QQuickTouchPoint::setUniqueId(const QPointingDeviceUniqueId &id) \c canceled should be handled in addition to \l released. \a touchPoints is the list of canceled points. - - The corresponding handler is \c onCanceled. */ /*! @@ -411,8 +403,6 @@ void QQuickTouchPoint::setUniqueId(const QPointingDeviceUniqueId &id) gesture is not grabbed, the nesting Flickable, for example, would also have an opportunity to grab. The \a gesture object also includes information on the current set of \c touchPoints and the \c dragThreshold. - - The corresponding handler is \c onGestureStarted. */ /*! @@ -421,8 +411,6 @@ void QQuickTouchPoint::setUniqueId(const QPointingDeviceUniqueId &id) This signal is emitted when the touch points handled by the MultiPointTouchArea change. This includes adding new touch points, removing or canceling previous touch points, as well as updating current touch point data. \a touchPoints is the list of all current touch points. - - The corresponding handler is \c onTouchUpdated. */ /*! diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp index 7ebe174a9e..4a8089f49c 100644 --- a/src/quick/items/qquickpathview.cpp +++ b/src/quick/items/qquickpathview.cpp @@ -1164,8 +1164,6 @@ bool QQuickPathView::isDragging() const This signal is emitted when the view begins moving due to user interaction. - - The corresponding handler is \c onMovementStarted. */ /*! @@ -1176,8 +1174,6 @@ bool QQuickPathView::isDragging() const be emitted once the flick stops. If a flick was not generated, this signal will be emitted when the user stops dragging - i.e. a mouse or touch release. - - The corresponding handler is \c onMovementEnded. */ /*! @@ -1186,16 +1182,12 @@ bool QQuickPathView::isDragging() const This signal is emitted when the view is flicked. A flick starts from the point that the mouse or touch is released, while still in motion. - - The corresponding handler is \c onFlickStarted. */ /*! \qmlsignal QtQuick::PathView::flickEnded() This signal is emitted when the view stops moving due to a flick. - - The corresponding handler is \c onFlickEnded. */ /*! @@ -1203,8 +1195,6 @@ bool QQuickPathView::isDragging() const This signal is emitted when the view starts to be dragged due to user interaction. - - The corresponding handler is \c onDragStarted. */ /*! @@ -1214,8 +1204,6 @@ bool QQuickPathView::isDragging() const If the velocity of the drag is suffient at the time the touch/mouse button is released then a flick will start. - - The corresponding handler is \c onDragEnded. */ /*! diff --git a/src/quick/items/qquickpincharea.cpp b/src/quick/items/qquickpincharea.cpp index 3d4f195380..f963bdf74f 100644 --- a/src/quick/items/qquickpincharea.cpp +++ b/src/quick/items/qquickpincharea.cpp @@ -210,8 +210,6 @@ QQuickPinchAreaPrivate::~QQuickPinchAreaPrivate() To ignore this gesture set the \c pinch.accepted property to false. The gesture will be canceled and no further events will be sent. - - The corresponding handler is \c onPinchStarted. */ /*! @@ -224,8 +222,6 @@ QQuickPinchAreaPrivate::~QQuickPinchAreaPrivate() reflect changes only since the beginning of the current gesture, and therefore are not limited by the minimum and maximum limits in the \l {PinchArea}{pinch} property. - - The corresponding handler is \c onPinchUpdated. */ /*! @@ -236,8 +232,6 @@ QQuickPinchAreaPrivate::~QQuickPinchAreaPrivate() The \l {PinchEvent}{pinch} parameter (not the same as the \l {PinchArea}{pinch} property) provides information about the pinch gesture, including the scale, center and angle of the pinch. - - The corresponding handler is \c onPinchFinished. */ /*! @@ -252,8 +246,6 @@ QQuickPinchAreaPrivate::~QQuickPinchAreaPrivate() will be greater than zero when the gesture indicates that the user wishes to enter smart zoom, and zero when exiting (even though typically the same gesture is used to toggle between the two states). - - The corresponding handler is \c onSmartZoom. */ diff --git a/src/quick/items/qquickpositioners.cpp b/src/quick/items/qquickpositioners.cpp index 65c48c583a..a8d050527b 100644 --- a/src/quick/items/qquickpositioners.cpp +++ b/src/quick/items/qquickpositioners.cpp @@ -928,8 +928,6 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem) \since 5.9 This signal is emitted when positioning has been completed. - - The corresponding handler is \c onPositioningComplete. */ QQuickColumn::QQuickColumn(QQuickItem *parent) @@ -1113,8 +1111,6 @@ void QQuickColumn::reportConflictingAnchors() \since 5.9 This signal is emitted when positioning has been completed. - - The corresponding handler is \c onPositioningComplete. */ class QQuickRowPrivate : public QQuickBasePositionerPrivate @@ -1408,8 +1404,6 @@ void QQuickRow::reportConflictingAnchors() \since 5.9 This signal is emitted when positioning has been completed. - - The corresponding handler is \c onPositioningComplete. */ class QQuickGridPrivate : public QQuickBasePositionerPrivate @@ -1992,8 +1986,6 @@ void QQuickGrid::reportConflictingAnchors() \since 5.9 This signal is emitted when positioning has been completed. - - The corresponding handler is \c onPositioningComplete. */ class QQuickFlowPrivate : public QQuickBasePositionerPrivate diff --git a/src/quick/items/qquickrepeater.cpp b/src/quick/items/qquickrepeater.cpp index c8c5281089..20603720c5 100644 --- a/src/quick/items/qquickrepeater.cpp +++ b/src/quick/items/qquickrepeater.cpp @@ -139,8 +139,6 @@ QQuickRepeaterPrivate::~QQuickRepeaterPrivate() This signal is emitted when an item is added to the repeater. The \a index parameter holds the index at which the item has been inserted within the repeater, and the \a item parameter holds the \l Item that has been added. - - The corresponding handler is \c onItemAdded. */ /*! @@ -152,8 +150,6 @@ QQuickRepeaterPrivate::~QQuickRepeaterPrivate() Do not keep a reference to \a item if it was created by this repeater, as in these cases it will be deleted shortly after the signal is handled. - - The corresponding handler is \c onItemRemoved. */ QQuickRepeater::QQuickRepeater(QQuickItem *parent) : QQuickItem(*(new QQuickRepeaterPrivate), parent) diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index c8f3f113dd..74cae71616 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -1423,8 +1423,6 @@ QQuickText::~QQuickText() } } \endcode - - The corresponding handler is \c onLineLaidOut. */ /*! @@ -1441,8 +1439,6 @@ QQuickText::~QQuickText() Clicking on the highlighted link will output \tt{http://qt-project.org link activated} to the console. - - The corresponding handler is \c onLinkActivated. */ /*! @@ -2869,8 +2865,6 @@ bool QQuickTextPrivate::isLinkHoveredConnected() text. The link must be in rich text or HTML format and the \a link string provides access to the particular link. - The corresponding handler is \c onLinkHovered. - \sa hoveredLink, linkAt() */ diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index bb6f003ceb..6726c68d0c 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -118,8 +118,6 @@ TextEdit { This signal is emitted when the user clicks on a link embedded in the text. The link must be in rich text or HTML format and the \a link string provides access to the particular link. - - The corresponding handler is \c onLinkActivated. */ // This is a pretty arbitrary figure. The idea is that we don't want to break down the document @@ -2902,8 +2900,6 @@ bool QQuickTextEditPrivate::isLinkHoveredConnected() The link must be in rich text or HTML format and the \a link string provides access to the particular link. - The corresponding handler is \c onLinkHovered. - \sa hoveredLink, linkAt() */ @@ -2912,8 +2908,6 @@ bool QQuickTextEditPrivate::isLinkHoveredConnected() \since 5.6 This signal is emitted when the text edit loses focus. - - The corresponding handler is \c onEditingFinished. */ /*! diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index b204cb3417..304f96e93a 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -1170,8 +1170,6 @@ bool QQuickTextInput::hasAcceptableInput() const Note that if there is a \l validator or \l inputMask set on the text input, the signal will only be emitted if the input is in an acceptable state. - - The corresponding handler is \c onAccepted. */ /*! @@ -1183,8 +1181,6 @@ bool QQuickTextInput::hasAcceptableInput() const inputMask set on the text input and enter/return is pressed, this signal will only be emitted if the input follows the inputMask and the validator returns an acceptable state. - - The corresponding handler is \c onEditingFinished. */ /*! @@ -1194,8 +1190,6 @@ bool QQuickTextInput::hasAcceptableInput() const This signal is emitted whenever the text is edited. Unlike \c textChanged(), this signal is not emitted when the text is changed programmatically, for example, by changing the value of the \c text property or by calling \c clear(). - - The corresponding handler is \c onTextEdited. */ #if QT_CONFIG(im) diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 39f238e4ed..b245b62d96 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -3970,8 +3970,6 @@ bool QQuickWindow::isSceneGraphInitialized() const property is true by default so that the window is allowed to close; but you can implement an \c onClosing handler and set \c {close.accepted = false} if you need to do something else before the window can be closed. - - The corresponding handler is \c onClosing. */ #if QT_CONFIG(opengl) diff --git a/src/quick/scenegraph/qsgadaptationlayer_p.h b/src/quick/scenegraph/qsgadaptationlayer_p.h index 6baee33b53..1db49feb5d 100644 --- a/src/quick/scenegraph/qsgadaptationlayer_p.h +++ b/src/quick/scenegraph/qsgadaptationlayer_p.h @@ -57,8 +57,10 @@ #include <QtCore/qrect.h> #include <QtGui/qbrush.h> #include <QtGui/qcolor.h> +#include <QtGui/qpainterpath.h> #include <QtCore/qsharedpointer.h> #include <QtGui/qglyphrun.h> +#include <QtGui/qpainterpath.h> #include <QtCore/qurl.h> #include <private/qfontengine_p.h> #include <QtGui/private/qdatabuffer_p.h> diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp index 763b0aa171..90c725a67f 100644 --- a/src/quick/util/qquickanimation.cpp +++ b/src/quick/util/qquickanimation.cpp @@ -213,8 +213,6 @@ QQmlProperty QQuickAbstractAnimationPrivate::createProperty(QObject *obj, const It is only triggered for top-level, standalone animations. It will not be triggered for animations in a Behavior or Transition, or animations that are part of an animation group. - - The corresponding handler is \c onStarted. */ /*! @@ -230,8 +228,6 @@ QQmlProperty QQuickAbstractAnimationPrivate::createProperty(QObject *obj, const If \l alwaysRunToEnd is true, this signal will not be emitted until the animation has completed its current iteration. - - The corresponding handler is \c onStopped. */ /*! @@ -250,8 +246,6 @@ QQmlProperty QQuickAbstractAnimationPrivate::createProperty(QObject *obj, const If \l alwaysRunToEnd is true, this signal will not be emitted until the animation has completed its current iteration. - The corresponding handler is \c onFinished. - \sa stopped(), started(), running */ diff --git a/src/quick/util/qquickshortcut.cpp b/src/quick/util/qquickshortcut.cpp index 8ef204d179..8e135b4624 100644 --- a/src/quick/util/qquickshortcut.cpp +++ b/src/quick/util/qquickshortcut.cpp @@ -80,16 +80,12 @@ /*! \qmlsignal QtQuick::Shortcut::activated() This signal is emitted when the shortcut is activated. - - The corresponding handler is \c onActivated. */ /*! \qmlsignal QtQuick::Shortcut::activatedAmbiguously() This signal is emitted when the shortcut is activated ambigously, meaning that it matches the start of more than one shortcut. - - The corresponding handler is \c onActivatedAmbiguously. */ static bool qQuickShortcutContextMatcher(QObject *obj, Qt::ShortcutContext context) diff --git a/tools/qmleasing/splineeditor.cpp b/tools/qmleasing/splineeditor.cpp index 3657fe3f27..c1afbbb441 100644 --- a/tools/qmleasing/splineeditor.cpp +++ b/tools/qmleasing/splineeditor.cpp @@ -30,11 +30,13 @@ #include "segmentproperties.h" #include <QPainter> +#include <QPainterPath> #include <QMouseEvent> #include <QContextMenuEvent> #include <QDebug> #include <QApplication> #include <QVector> +#include <QPainterPath> const int canvasWidth = 640; const int canvasHeight = 320; |