aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/winextras/qquickwintaskbarbutton.cpp20
-rw-r--r--src/imports/winextras/qquickwintaskbarbutton.h7
2 files changed, 14 insertions, 13 deletions
diff --git a/src/imports/winextras/qquickwintaskbarbutton.cpp b/src/imports/winextras/qquickwintaskbarbutton.cpp
index c1c16af..8a34f44 100644
--- a/src/imports/winextras/qquickwintaskbarbutton.cpp
+++ b/src/imports/winextras/qquickwintaskbarbutton.cpp
@@ -77,12 +77,12 @@ QQuickWinTaskbarButton::~QQuickWinTaskbarButton()
int QQuickWinTaskbarButton::progressMinimum() const
{
- return button->progressMinimum();
+ return button->progressBar()->minimum();
}
void QQuickWinTaskbarButton::setProgressMinimum(int min)
{
- button->setProgressMinimum(min);
+ button->progressBar()->setMinimum(min);
}
/*!
@@ -92,12 +92,12 @@ void QQuickWinTaskbarButton::setProgressMinimum(int min)
*/
int QQuickWinTaskbarButton::progressMaximum() const
{
- return button->progressMaximum();
+ return button->progressBar()->maximum();
}
void QQuickWinTaskbarButton::setProgressMaximum(int max)
{
- button->setProgressMaximum(max);
+ button->progressBar()->setMaximum(max);
}
/*!
@@ -107,12 +107,12 @@ void QQuickWinTaskbarButton::setProgressMaximum(int max)
*/
int QQuickWinTaskbarButton::progressValue() const
{
- return button->progressValue();
+ return button->progressBar()->value();
}
void QQuickWinTaskbarButton::setProgressValue(int progress)
{
- button->setProgressValue(progress);
+ button->progressBar()->setValue(progress);
}
/*!
@@ -169,14 +169,14 @@ void QQuickWinTaskbarButton::setIconDescription(const QString &descr)
\li The progress indicator turns red.
\endtable
*/
-QWinTaskbarButton::ProgressState QQuickWinTaskbarButton::progressState() const
+QWinTaskbarProgress::ProgressState QQuickWinTaskbarButton::progressState() const
{
- return button->progressState();
+ return button->progressBar()->state();
}
-void QQuickWinTaskbarButton::setProgressState(QWinTaskbarButton::ProgressState state)
+void QQuickWinTaskbarButton::setProgressState(QWinTaskbarProgress::ProgressState state)
{
- button->setProgressState(state);
+ button->progressBar()->setState(state);
}
void QQuickWinTaskbarButton::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data)
diff --git a/src/imports/winextras/qquickwintaskbarbutton.h b/src/imports/winextras/qquickwintaskbarbutton.h
index 65185c8..c575077 100644
--- a/src/imports/winextras/qquickwintaskbarbutton.h
+++ b/src/imports/winextras/qquickwintaskbarbutton.h
@@ -44,6 +44,7 @@
#include <QQuickItem>
#include <QWinTaskbarButton>
+#include <QWinTaskbarProgress>
QT_BEGIN_NAMESPACE
@@ -57,7 +58,7 @@ class QQuickWinTaskbarButton : public QQuickItem
Q_PROPERTY(int progressValue READ progressValue WRITE setProgressValue)
Q_PROPERTY(QString overlayIcon READ overlayIcon WRITE setOverlayIcon)
Q_PROPERTY(QString iconDescription READ iconDescription WRITE setIconDescription)
- Q_PROPERTY(QWinTaskbarButton::ProgressState progressState READ progressState WRITE setProgressState)
+ Q_PROPERTY(QWinTaskbarProgress::ProgressState progressState READ progressState WRITE setProgressState)
public:
Q_ENUMS(QWinTaskbarButton::ProgressState)
@@ -75,8 +76,8 @@ public:
QString iconDescription() const;
void setIconDescription(const QString &descr);
- QWinTaskbarButton::ProgressState progressState() const;
- void setProgressState(QWinTaskbarButton::ProgressState state);
+ QWinTaskbarProgress::ProgressState progressState() const;
+ void setProgressState(QWinTaskbarProgress::ProgressState state);
protected:
void itemChange(ItemChange, const ItemChangeData &) Q_DECL_OVERRIDE;