aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/winextras/qwinjumplist.cpp3
-rw-r--r--tests/auto/qwinjumplist/tst_qwinjumplist.cpp2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/winextras/qwinjumplist.cpp b/src/winextras/qwinjumplist.cpp
index cc05c0e..5d2020e 100644
--- a/src/winextras/qwinjumplist.cpp
+++ b/src/winextras/qwinjumplist.cpp
@@ -543,6 +543,9 @@ QList<QWinJumpListCategory *> QWinJumpList::categories() const
void QWinJumpList::addCategory(QWinJumpListCategory *category)
{
Q_D(QWinJumpList);
+ if (!category)
+ return;
+
QWinJumpListCategoryPrivate::get(category)->jumpList = this;
d->categories.append(category);
d->invalidate();
diff --git a/tests/auto/qwinjumplist/tst_qwinjumplist.cpp b/tests/auto/qwinjumplist/tst_qwinjumplist.cpp
index 1d621c6..58dcfa1 100644
--- a/tests/auto/qwinjumplist/tst_qwinjumplist.cpp
+++ b/tests/auto/qwinjumplist/tst_qwinjumplist.cpp
@@ -198,6 +198,8 @@ void tst_QWinJumpList::testCategories()
QWinJumpList jumplist;
QVERIFY(jumplist.categories().isEmpty());
+ jumplist.addCategory(0);
+
QWinJumpListCategory *cat1 = new QWinJumpListCategory(QStringLiteral("tmp"));
QCOMPARE(cat1->title(), QStringLiteral("tmp"));
cat1->setTitle(QStringLiteral("cat1"));