aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog11
-rw-r--r--libqmenumodel/src/qmenumodel.cpp3
2 files changed, 14 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 90f7210..d1c3fd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+qmenumodel (0.2.6daily13.06.07-0ubuntu1) saucy; urgency=low
+
+ [ Alberto Mardegan ]
+ * Use invalid index as root index When emitting the rowsInserted
+ signal for top-level items, use an invalid QModelIndex as parent.
+
+ [ Ubuntu daily release ]
+ * Automatic snapshot from revision 68
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 07 Jun 2013 02:02:05 +0000
+
qmenumodel (0.2.6daily13.05.02-0ubuntu1) saucy; urgency=low
[ Mathieu Trudel-Lapierre ]
diff --git a/libqmenumodel/src/qmenumodel.cpp b/libqmenumodel/src/qmenumodel.cpp
index 5faeb43..9bc9e02 100644
--- a/libqmenumodel/src/qmenumodel.cpp
+++ b/libqmenumodel/src/qmenumodel.cpp
@@ -252,6 +252,9 @@ void QMenuModel::onItemsChanged(MenuNode *node,
/*! \internal */
QModelIndex QMenuModel::indexFromNode(MenuNode *node) const
{
+ if (node == m_root) {
+ return QModelIndex();
+ }
return createIndex(node->position(), 0, node);
}