aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2013-08-26 14:31:11 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-26 14:41:17 +0200
commit73e93432727bc10642b59fb983937cb1060dcbc1 (patch)
treede403e4b8c13ce891a05fd2f90feaab42f4f7989 /src
parent55d41cf9cffc724bb6ce6632ebf1b5dfab25bbb1 (diff)
Make QWinTaskbarButton::window a property
Add QWinTaskbarButton::window() for symmetry, and to be consistent QWinThumbnailToolBar. Change-Id: I5dc1f47e2c1b9eabd94524d29e3788364114952c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/winextras/qwintaskbarbutton.cpp10
-rw-r--r--src/winextras/qwintaskbarbutton.h3
2 files changed, 11 insertions, 2 deletions
diff --git a/src/winextras/qwintaskbarbutton.cpp b/src/winextras/qwintaskbarbutton.cpp
index 192987b..a9d4804 100644
--- a/src/winextras/qwintaskbarbutton.cpp
+++ b/src/winextras/qwintaskbarbutton.cpp
@@ -103,8 +103,8 @@ QWinTaskbarButton::~QWinTaskbarButton()
}
/*!
- Sets the \a window whose taskbar button this QWinTaskbarButton will operate
- on.
+ \property QWinTaskbarButton::window
+ \brief the window whose taskbar button is manipulated
*/
void QWinTaskbarButton::setWindow(QWindow *window)
{
@@ -121,6 +121,12 @@ void QWinTaskbarButton::setWindow(QWindow *window)
}
}
+QWindow *QWinTaskbarButton::window() const
+{
+ Q_D(const QWinTaskbarButton);
+ return d->window;
+}
+
/*!
\property QWinTaskbarButton::overlayIcon
\brief the overlay icon of the button
diff --git a/src/winextras/qwintaskbarbutton.h b/src/winextras/qwintaskbarbutton.h
index 562e1f6..08c3085 100644
--- a/src/winextras/qwintaskbarbutton.h
+++ b/src/winextras/qwintaskbarbutton.h
@@ -59,6 +59,7 @@ class Q_WINEXTRAS_EXPORT QWinTaskbarButton : public QObject
Q_PROPERTY(int progressMaximum READ progressMaximum WRITE setProgressMaximum)
Q_PROPERTY(int progressMinimum READ progressMinimum WRITE setProgressMinimum)
Q_PROPERTY(ProgressState progressState READ progressState WRITE setProgressState)
+ Q_PROPERTY(QWindow *window READ window WRITE setWindow)
public:
enum ProgressState {
@@ -73,7 +74,9 @@ public:
explicit QWinTaskbarButton(QObject *parent = 0);
~QWinTaskbarButton();
+
void setWindow(QWindow *window);
+ QWindow *window() const;
QIcon overlayIcon() const;
QString overlayIconAccessibilityDescription() const;