aboutsummaryrefslogtreecommitdiffstats
path: root/src/templates
diff options
context:
space:
mode:
Diffstat (limited to 'src/templates')
-rw-r--r--src/templates/qquickpageindicator.cpp25
-rw-r--r--src/templates/qquickpageindicator_p.h6
2 files changed, 0 insertions, 31 deletions
diff --git a/src/templates/qquickpageindicator.cpp b/src/templates/qquickpageindicator.cpp
index c8518b6f..31fe28db 100644
--- a/src/templates/qquickpageindicator.cpp
+++ b/src/templates/qquickpageindicator.cpp
@@ -81,7 +81,6 @@ public:
bool interactive;
QQmlComponent *delegate;
QQuickItem *pressedItem;
- QColor color;
};
QQuickItem *QQuickPageIndicatorPrivate::itemAt(const QPoint &pos) const
@@ -200,8 +199,6 @@ void QQuickPageIndicator::setInteractive(bool interactive)
\row \li \b index : int \li The index of the item
\row \li \b pressed : bool \li Whether the item is pressed
\endtable
-
- \sa color
*/
QQmlComponent *QQuickPageIndicator::delegate() const
{
@@ -218,28 +215,6 @@ void QQuickPageIndicator::setDelegate(QQmlComponent *delegate)
}
}
-/*!
- \qmlproperty color Qt.labs.controls::PageIndicator::color
-
- This property holds the color of the indicator.
-
- \sa delegate
-*/
-QColor QQuickPageIndicator::color() const
-{
- Q_D(const QQuickPageIndicator);
- return d->color;
-}
-
-void QQuickPageIndicator::setColor(const QColor &color)
-{
- Q_D(QQuickPageIndicator);
- if (d->color != color) {
- d->color = color;
- emit colorChanged();
- }
-}
-
void QQuickPageIndicator::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem)
{
Q_D(QQuickPageIndicator);
diff --git a/src/templates/qquickpageindicator_p.h b/src/templates/qquickpageindicator_p.h
index bb0bdf3c..46eb2cb2 100644
--- a/src/templates/qquickpageindicator_p.h
+++ b/src/templates/qquickpageindicator_p.h
@@ -49,7 +49,6 @@
//
#include <QtLabsTemplates/private/qquickcontrol_p.h>
-#include <QtGui/qcolor.h>
QT_BEGIN_NAMESPACE
@@ -63,7 +62,6 @@ class Q_LABSTEMPLATES_EXPORT QQuickPageIndicator : public QQuickControl
Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged FINAL)
Q_PROPERTY(bool interactive READ isInteractive WRITE setInteractive NOTIFY interactiveChanged FINAL)
Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged FINAL)
- Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged FINAL)
public:
explicit QQuickPageIndicator(QQuickItem *parent = Q_NULLPTR);
@@ -80,15 +78,11 @@ public:
QQmlComponent *delegate() const;
void setDelegate(QQmlComponent *delegate);
- QColor color() const;
- void setColor(const QColor &color);
-
Q_SIGNALS:
void countChanged();
void currentIndexChanged();
void interactiveChanged();
void delegateChanged();
- void colorChanged();
protected:
void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) Q_DECL_OVERRIDE;