summaryrefslogtreecommitdiff
path: root/src/controls/Slider.qml
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@theqtcompany.com>2016-06-21 12:21:59 +0200
committerTopi Reiniƶ <topi.reinio@theqtcompany.com>2016-06-22 12:51:42 +0000
commit0c957f241ff974ae1169faa733b700185917227f (patch)
treea993ff90c95946e63a512ff29abb9e66ae5d7cb4 /src/controls/Slider.qml
parent97e13b5f1b8b4e64b1ec8a503036afbd4f408148 (diff)
downloadqtquickcontrols-0c957f241ff974ae1169faa733b700185917227f.tar.gz
Revert "Fix Controls 1 types linking to Controls 2"
This reverts commit b5a8306bf6d4949066872ac2afc8d0a01f716bd7. The incorrect \inherits commands caused property documentation from base types go missing. Task-number: QTBUG-54150 Change-Id: I0bbe604a6fe904d8e6a4596777262255a794ec62 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/controls/Slider.qml')
-rw-r--r--src/controls/Slider.qml1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/controls/Slider.qml b/src/controls/Slider.qml
index 9072104f..f38db0e4 100644
--- a/src/controls/Slider.qml
+++ b/src/controls/Slider.qml
@@ -46,7 +46,6 @@ import QtQuick.Controls.Private 1.0
\inqmlmodule QtQuick.Controls
\since 5.1
\ingroup controls
- \inherits QtQuickControls1::Control
\brief Provides a vertical or horizontal slider control.
\image slider.png