diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-03 18:20:15 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-03 19:20:42 +0100 |
| commit | 6c88fe58a6037d252f40bf00aa5052b0f724a862 (patch) | |
| tree | 9afdf0b638bc89e5e71eeac7b3c06ed53831e45b /src/quicktemplates2/qquickcontrol.cpp | |
| parent | 83cbe4e899d2d22e923bdc10e90f91ef106edf58 (diff) | |
| parent | 3f646aca34c25f7cc36df2f988790bb238026422 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/imports/controls/BusyIndicator.qml
src/imports/controls/ProgressBar.qml
src/quicktemplates2/qquickpopup.cpp
src/quicktemplates2/qquickpopup_p_p.h
src/quicktemplates2/qquickstackview.cpp
Change-Id: I9a1028a991de9fc3e26d3f973106301e9ada631c
Diffstat (limited to 'src/quicktemplates2/qquickcontrol.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickcontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp index 20de449e..b5b98c8f 100644 --- a/src/quicktemplates2/qquickcontrol.cpp +++ b/src/quicktemplates2/qquickcontrol.cpp @@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE \instantiates QQuickControl \inqmlmodule QtQuick.Controls \since 5.7 - \brief The base type of user interface controls. + \brief Abstract base type providing functionality common to all controls. Control is the base type of user interface controls. It receives input events from the window system, and paints a representation of itself on |