diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2013-09-06 21:11:13 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-09 10:56:53 +0200 |
commit | 92a0705caf02d8c43ed69dc4cd6ecd1dcd2b08f5 (patch) | |
tree | 746f7f3ba582fec1bdeef015449cb49472545b77 | |
parent | df79ea24d33f8f31c16d4433e5dec7cf7b81818f (diff) |
Support deleting QWinTaskbarProgress
Change-Id: Iaa08f9003e48e7d3b1626e8274211dd53a3c1eb6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
-rw-r--r-- | src/winextras/qwintaskbarbutton.cpp | 1 | ||||
-rw-r--r-- | tests/auto/qwintaskbarbutton/tst_qwintaskbarbutton.cpp | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/winextras/qwintaskbarbutton.cpp b/src/winextras/qwintaskbarbutton.cpp index 4b5d7ec..a5d994d 100644 --- a/src/winextras/qwintaskbarbutton.cpp +++ b/src/winextras/qwintaskbarbutton.cpp @@ -258,6 +258,7 @@ QWinTaskbarProgress *QWinTaskbarButton::progress() const if (!d->progressBar) { QWinTaskbarButton *that = const_cast<QWinTaskbarButton *>(this); QWinTaskbarProgress *pbar = new QWinTaskbarProgress(that); + connect(pbar, SIGNAL(destroyed()), this, SLOT(_q_updateProgress())); connect(pbar, SIGNAL(valueChanged(int)), this, SLOT(_q_updateProgress())); connect(pbar, SIGNAL(minimumChanged(int)), this, SLOT(_q_updateProgress())); connect(pbar, SIGNAL(maximumChanged(int)), this, SLOT(_q_updateProgress())); diff --git a/tests/auto/qwintaskbarbutton/tst_qwintaskbarbutton.cpp b/tests/auto/qwintaskbarbutton/tst_qwintaskbarbutton.cpp index 947f068..0f44add 100644 --- a/tests/auto/qwintaskbarbutton/tst_qwintaskbarbutton.cpp +++ b/tests/auto/qwintaskbarbutton/tst_qwintaskbarbutton.cpp @@ -41,6 +41,7 @@ #include <QtTest/QtTest> #include <QWinTaskbarButton> +#include <QWinTaskbarProgress> class tst_QWinTaskbarButton : public QObject { @@ -101,6 +102,13 @@ void tst_QWinTaskbarButton::testProgress() { QWinTaskbarButton btn; QVERIFY(btn.progress()); + QVERIFY(btn.progress()->objectName().isEmpty()); + + btn.progress()->setObjectName(QStringLiteral("DEAD")); + delete btn.progress(); + + QVERIFY(btn.progress()); + QVERIFY(btn.progress()->objectName().isEmpty()); } QTEST_MAIN(tst_QWinTaskbarButton) |