aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/qml/doc/src/qmllint/signal-handler-parameters.qdoc4
-rw-r--r--src/quicktemplates/qquickmenu.cpp4
-rw-r--r--src/quicktemplates/qquickmenubar.cpp8
-rw-r--r--src/quicktemplates/qquickpopup.cpp3
-rw-r--r--src/quicktemplates/qquickrangeslider.cpp12
-rw-r--r--src/quicktemplates/qquickspinbox.cpp8
-rw-r--r--src/quicktemplates/qquickstackview.cpp20
-rw-r--r--src/quicktemplates/qquickswipedelegate.cpp4
-rw-r--r--src/quicktemplates/qquicktabbar.cpp8
9 files changed, 36 insertions, 35 deletions
diff --git a/src/qml/doc/src/qmllint/signal-handler-parameters.qdoc b/src/qml/doc/src/qmllint/signal-handler-parameters.qdoc
index 12f5b5b51f..7daf61ce4e 100644
--- a/src/qml/doc/src/qmllint/signal-handler-parameters.qdoc
+++ b/src/qml/doc/src/qmllint/signal-handler-parameters.qdoc
@@ -85,7 +85,7 @@ target_link_libraries(appuntitled27
)
\endcode
The C++ dependency \c{Quick} was declared, such that this class can compile and the QQuickItem
-include can be found. Also, mymodule does not have any dependency on QtQuick.
+include can be found. Also, mymodule does not have any QML dependency on \l{Qt Quick}.
Now, lets try to handle this \c{helloWorld} signal in QML:
\qml
@@ -97,7 +97,7 @@ MyCppObject {
\endqml
The reason of the warning message is that in the QML code, \c{QQuickItem} and its QML counterpart
-\c{Item} are not known: the dependency 'QtQuick' of MyModule was not declared in the CMakeLists.txt!
+\c{Item} are not known: the dependency \c QtQuick of MyModule was not declared in the CMakeLists.txt!
You can add it as following in the qt_add_qml_module() call:
\badcode
diff --git a/src/quicktemplates/qquickmenu.cpp b/src/quicktemplates/qquickmenu.cpp
index 7aa43a42d8..292545bd42 100644
--- a/src/quicktemplates/qquickmenu.cpp
+++ b/src/quicktemplates/qquickmenu.cpp
@@ -67,7 +67,7 @@ static const int SUBMENU_DELAY = 225;
\caption Native macOS menu.
\li \image qtquickcontrols-menu.png
\caption Non-native \l {Material Style}{Material style} menu.
- \endtable
+ \endtable
Menu has two main use cases:
\list
@@ -88,7 +88,7 @@ static const int SUBMENU_DELAY = 225;
\snippet qtquickcontrols-menu-closepolicy.qml closePolicy
- Since QtQuick.Controls 2.3 (Qt 5.10), it is also possible to create sub-menus
+ Since \l{QtQuick.Controls} 2.3 (Qt 5.10), it is also possible to create sub-menus
and declare Action objects inside Menu:
\snippet qtquickcontrols-menu-submenus-and-actions.qml root
diff --git a/src/quicktemplates/qquickmenubar.cpp b/src/quicktemplates/qquickmenubar.cpp
index c45e2472a2..16a9b62521 100644
--- a/src/quicktemplates/qquickmenubar.cpp
+++ b/src/quicktemplates/qquickmenubar.cpp
@@ -778,8 +778,8 @@ QQuickMenu *QQuickMenuBar::takeMenu(int index)
This property holds the content width. It is used for calculating the total
implicit width of the menu bar.
- \note This property is available in MenuBar since QtQuick.Controls 2.3 (Qt 5.10),
- but it was promoted to the Container base type in QtQuick.Controls 2.5 (Qt 5.12).
+ \note This property is available in MenuBar since \l{QtQuick.Controls} 2.3 (Qt 5.10),
+ but it was promoted to the Container base type in \l{QtQuick.Controls} 2.5 (Qt 5.12).
\sa Container::contentWidth
*/
@@ -791,8 +791,8 @@ QQuickMenu *QQuickMenuBar::takeMenu(int index)
This property holds the content height. It is used for calculating the total
implicit height of the menu bar.
- \note This property is available in MenuBar since QtQuick.Controls 2.3 (Qt 5.10),
- but it was promoted to the Container base type in QtQuick.Controls 2.5 (Qt 5.12).
+ \note This property is available in MenuBar since \l{QtQuick.Controls} 2.3 (Qt 5.10),
+ but it was promoted to the Container base type in \l{QtQuick.Controls} 2.5 (Qt 5.12).
\sa Container::contentHeight
*/
diff --git a/src/quicktemplates/qquickpopup.cpp b/src/quicktemplates/qquickpopup.cpp
index fad09b7880..e884be42f3 100644
--- a/src/quicktemplates/qquickpopup.cpp
+++ b/src/quicktemplates/qquickpopup.cpp
@@ -354,7 +354,8 @@ Q_STATIC_LOGGING_CATEGORY(lcQuickPopup, "qt.quick.controls.popup")
\section1 Property Propagation
Popup inherits fonts, palettes and attached properties through its parent
- window, not its \l {Visual Parent}{object or visual parent}:
+ window, not its
+ \l {Concepts - Visual Parent in Qt Quick#Visual Parent}{object or visual parent}:
\snippet qtquickcontrols-popup-property-propagation.qml file
diff --git a/src/quicktemplates/qquickrangeslider.cpp b/src/quicktemplates/qquickrangeslider.cpp
index 54e1484415..56fb8a9b59 100644
--- a/src/quicktemplates/qquickrangeslider.cpp
+++ b/src/quicktemplates/qquickrangeslider.cpp
@@ -804,15 +804,15 @@ qreal QQuickRangeSlider::valueAt(qreal position) const
\row
\li hovered
\li This property holds whether the first handle is hovered.
- This property was introduced in QtQuick.Controls 2.1.
+ This property was introduced in \l{QtQuick.Controls} 2.1.
\row
\li implicitHandleWidth
\li This property holds the implicit width of the first handle.
- This property was introduced in QtQuick.Controls 2.5.
+ This property was introduced in \l{QtQuick.Controls} 2.5.
\row
\li implicitHandleHeight
\li This property holds the implicit height of the first handle.
- This property was introduced in QtQuick.Controls 2.5.
+ This property was introduced in \l{QtQuick.Controls} 2.5.
\endtable
\sa first.moved(), first.increase(), first.decrease()
@@ -882,15 +882,15 @@ QQuickRangeSliderNode *QQuickRangeSlider::first() const
\row
\li hovered
\li This property holds whether the second handle is hovered.
- This property was introduced in QtQuick.Controls 2.1.
+ This property was introduced in \l{QtQuick.Controls} 2.1.
\row
\li implicitHandleWidth
\li This property holds the implicit width of the second handle.
- This property was introduced in QtQuick.Controls 2.5.
+ This property was introduced in \l{QtQuick.Controls} 2.5.
\row
\li implicitHandleHeight
\li This property holds the implicit height of the second handle.
- This property was introduced in QtQuick.Controls 2.5.
+ This property was introduced in \l{QtQuick.Controls} 2.5.
\endtable
\sa second.moved(), second.increase(), second.decrease()
diff --git a/src/quicktemplates/qquickspinbox.cpp b/src/quicktemplates/qquickspinbox.cpp
index f63ad68bf6..00b6b9b4ab 100644
--- a/src/quicktemplates/qquickspinbox.cpp
+++ b/src/quicktemplates/qquickspinbox.cpp
@@ -804,9 +804,9 @@ void QQuickSpinBox::setValueFromText(const QJSValue &callback)
\qmlproperty real QtQuick.Controls::SpinBox::up.implicitIndicatorHeight
These properties hold the up indicator item and whether it is pressed or
- hovered. The \c up.hovered property was introduced in QtQuick.Controls 2.1,
+ hovered. The \c up.hovered property was introduced in \l{QtQuick.Controls} 2.1,
and the \c up.implicitIndicatorWidth and \c up.implicitIndicatorHeight
- properties were introduced in QtQuick.Controls 2.5.
+ properties were introduced in \l{QtQuick.Controls} 2.5.
\sa increase()
*/
@@ -824,9 +824,9 @@ QQuickIndicatorButton *QQuickSpinBox::up() const
\qmlproperty real QtQuick.Controls::SpinBox::down.implicitIndicatorHeight
These properties hold the down indicator item and whether it is pressed or
- hovered. The \c down.hovered property was introduced in QtQuick.Controls 2.1,
+ hovered. The \c down.hovered property was introduced in \l{QtQuick.Controls} 2.1,
and the \c down.implicitIndicatorWidth and \c down.implicitIndicatorHeight
- properties were introduced in QtQuick.Controls 2.5.
+ properties were introduced in \l{QtQuick.Controls} 2.5.
\sa decrease()
*/
diff --git a/src/quicktemplates/qquickstackview.cpp b/src/quicktemplates/qquickstackview.cpp
index f3339c1ecc..8314414788 100644
--- a/src/quicktemplates/qquickstackview.cpp
+++ b/src/quicktemplates/qquickstackview.cpp
@@ -559,9 +559,9 @@ QQuickItem *QQuickStackView::find(const QJSValue &callback, LoadBehavior behavio
operations:
\value StackView.Immediate An immediate operation without transitions.
- \value StackView.PushTransition An operation with push transitions (since QtQuick.Controls 2.1).
- \value StackView.ReplaceTransition An operation with replace transitions (since QtQuick.Controls 2.1).
- \value StackView.PopTransition An operation with pop transitions (since QtQuick.Controls 2.1).
+ \value StackView.PushTransition An operation with push transitions (since \l{QtQuick.Controls} 2.1).
+ \value StackView.ReplaceTransition An operation with replace transitions (since \l{QtQuick.Controls} 2.1).
+ \value StackView.PopTransition An operation with pop transitions (since \l{QtQuick.Controls} 2.1).
If no operation is provided, \c Immediate will be used if the stack is
empty, and \c PushTransition otherwise.
@@ -667,9 +667,9 @@ void QQuickStackView::push(QQmlV4FunctionPtr args)
operations:
\value StackView.Immediate An immediate operation without transitions.
- \value StackView.PushTransition An operation with push transitions (since QtQuick.Controls 2.1).
- \value StackView.ReplaceTransition An operation with replace transitions (since QtQuick.Controls 2.1).
- \value StackView.PopTransition An operation with pop transitions (since QtQuick.Controls 2.1).
+ \value StackView.PushTransition An operation with push transitions (since \l{QtQuick.Controls} 2.1).
+ \value StackView.ReplaceTransition An operation with replace transitions (since \l{QtQuick.Controls} 2.1).
+ \value StackView.PopTransition An operation with pop transitions (since \l{QtQuick.Controls} 2.1).
If no operation is provided, \c PopTransition will be used.
@@ -819,9 +819,9 @@ void QQuickStackView::pop(QQmlV4FunctionPtr args)
operations:
\value StackView.Immediate An immediate operation without transitions.
- \value StackView.PushTransition An operation with push transitions (since QtQuick.Controls 2.1).
- \value StackView.ReplaceTransition An operation with replace transitions (since QtQuick.Controls 2.1).
- \value StackView.PopTransition An operation with pop transitions (since QtQuick.Controls 2.1).
+ \value StackView.PushTransition An operation with push transitions (since \l{QtQuick.Controls} 2.1).
+ \value StackView.ReplaceTransition An operation with replace transitions (since \l{QtQuick.Controls} 2.1).
+ \value StackView.PopTransition An operation with pop transitions (since \l{QtQuick.Controls} 2.1).
If no operation is provided, \c Immediate will be used if the stack is
empty, and \c ReplaceTransition otherwise.
@@ -1396,7 +1396,7 @@ bool QQuickStackView::isEmpty() const
\include qquickstackview.qdocinc pop-ownership
- Since QtQuick.Controls 2.3, a \a transition can be optionally specified. Supported transitions:
+ Since \l{QtQuick.Controls} 2.3, a \a transition can be optionally specified. Supported transitions:
\value StackView.Immediate Clear the stack immediately without any transition (default).
\value StackView.PushTransition Clear the stack with a push transition.
diff --git a/src/quicktemplates/qquickswipedelegate.cpp b/src/quicktemplates/qquickswipedelegate.cpp
index 11f4371daa..154539b363 100644
--- a/src/quicktemplates/qquickswipedelegate.cpp
+++ b/src/quicktemplates/qquickswipedelegate.cpp
@@ -1152,7 +1152,7 @@ QQuickSwipeDelegate::QQuickSwipeDelegate(QQuickItem *parent)
\li enabled
\li This property determines whether or not the control can be swiped.
- This property was added in QtQuick.Controls 2.2.
+ This property was added in \l{QtQuick.Controls} 2.2.
\row
\li left
\li This property holds the left delegate.
@@ -1207,7 +1207,7 @@ QQuickSwipeDelegate::QQuickSwipeDelegate(QQuickItem *parent)
\snippet qtquickcontrols-swipedelegate-transition.qml 1
- This property was added in Qt Quick Controls 2.2.
+ This property was added in \l{QtQuick.Controls} 2.2.
\endtable
\sa {Control::}{contentItem}, {Control::}{background}, swipe.open(), swipe.close()
diff --git a/src/quicktemplates/qquicktabbar.cpp b/src/quicktemplates/qquicktabbar.cpp
index ad8c992d3b..e87b9e4c93 100644
--- a/src/quicktemplates/qquicktabbar.cpp
+++ b/src/quicktemplates/qquicktabbar.cpp
@@ -275,8 +275,8 @@ void QQuickTabBar::setPosition(Position position)
This property holds the content width. It is used for calculating the total
implicit width of the tab bar.
- \note This property is available in TabBar since QtQuick.Controls 2.2 (Qt 5.9),
- but it was promoted to the Container base type in QtQuick.Controls 2.5 (Qt 5.12).
+ \note This property is available in TabBar since \l{QtQuick.Controls} 2.2 (Qt 5.9),
+ but it was promoted to the Container base type in \l{QtQuick.Controls} 2.5 (Qt 5.12).
\sa Container::contentWidth
*/
@@ -288,8 +288,8 @@ void QQuickTabBar::setPosition(Position position)
This property holds the content height. It is used for calculating the total
implicit height of the tab bar.
- \note This property is available in TabBar since QtQuick.Controls 2.2 (Qt 5.9),
- but it was promoted to the Container base type in QtQuick.Controls 2.5 (Qt 5.12).
+ \note This property is available in TabBar since \l{QtQuick.Controls} 2.2 (Qt 5.9),
+ but it was promoted to the Container base type in \l{QtQuick.Controls} 2.5 (Qt 5.12).
\sa Container::contentHeight
*/