summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkku Luukkainen <markku.luukkainen@digia.com>2009-06-06 16:50:17 (GMT)
committerMarkku Luukkainen <markku.luukkainen@digia.com>2009-06-06 16:50:17 (GMT)
commit9420db9284f20e28239d1c6e8a4cccf7707c014e (patch)
treed21bbcf7294ac1f24a12ad5e1f8c29b5a43d694b
parent93922e26a2411c0f11e7cdc49b306823e23cda8b (diff)
downloadQt-9420db9284f20e28239d1c6e8a4cccf7707c014e.zip
Qt-9420db9284f20e28239d1c6e8a4cccf7707c014e.tar.gz
Qt-9420db9284f20e28239d1c6e8a4cccf7707c014e.tar.bz2
Fixed bug that caused the softkeys list not to be cleared after
the softkeys in the list were deleted
-rw-r--r--src/gui/kernel/qwidget.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 0a7fea3..7a8b143 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -11528,6 +11528,7 @@ void QWidget::setSoftKeys(QAction *softKey)
{
Q_D(QWidget);
qDeleteAll(d->softKeys);
+ d->softKeys.clear();
if (softKey)
d->softKeys.append(softKey);
// d->setNativeSoftKeys(softkeys);
@@ -11537,6 +11538,7 @@ void QWidget::setSoftKeys(const QList<QAction*> &softKeys)
{
Q_D(QWidget);
qDeleteAll(d->softKeys);
+ d->softKeys.clear();
for(int i = 0; i < softKeys.count(); i++)
d->softKeys.append(softKeys.at(i));