7 files changed, 41 insertions, 76 deletions
diff --git a/debian/changelog b/debian/changelog
index b998fd3..f5fcd43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,41 @@
+qmenumodel (0.2.7+13.10.20130829.1-0ubuntu1) saucy; urgency=low
+
+  [ Nick Dedekind ]
+  * Let Qt manage the destruction of child ActionStateParsers.
+
+  [ Lars Uebernickel ]
+  * Remove theme image provider The platform should provide that,
+    because more than this one module ned themed icons.
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 83
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Thu, 29 Aug 2013 18:06:45 +0000
+
+qmenumodel (0.2.7+13.10.20130828.2-0ubuntu1) saucy; urgency=low
+
+  [ Lars Uebernickel ]
+  * Make sure the right qt modules are loaded to make QMenuModel tests
+    pass. (LP: #1217335)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 80
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Wed, 28 Aug 2013 10:08:37 +0000
+
+qmenumodel (0.2.7+13.10.20130827.3-0ubuntu1) saucy; urgency=low
+
+  [ Nick Dedekind ]
+  * UnityMenuModel::changeState now uses current state parameter type as
+    a base for parameter GVariant conversion.
+  * Adds qt event spawning to direct glib main loop callbacks. (LP:
+    #1183065, #1206991)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 78
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Tue, 27 Aug 2013 14:08:51 +0000
+
 qmenumodel (0.2.7+13.10.20130826-0ubuntu1) saucy; urgency=low
 
   [ Nick Dedekind ]
diff --git a/libqmenumodel/QMenuModel/plugin.cpp b/libqmenumodel/QMenuModel/plugin.cpp
index 117a37a..b7a4400 100644
--- a/libqmenumodel/QMenuModel/plugin.cpp
+++ b/libqmenumodel/QMenuModel/plugin.cpp
@@ -24,13 +24,11 @@
 #include "qstateaction.h"
 #include "unitymenuaction.h"
 #include "unitymenumodel.h"
-#include "unitythemediconprovider.h"
 
 #include <QtQml>
 
 void QMenuModelQmlPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 {
-    engine->addImageProvider("theme", new UnityThemedIconProvider);
 }
 
 void QMenuModelQmlPlugin::registerTypes(const char *uri)
diff --git a/libqmenumodel/src/CMakeLists.txt b/libqmenumodel/src/CMakeLists.txt
index 5d4a16a..e8eb4c0 100644
--- a/libqmenumodel/src/CMakeLists.txt
+++ b/libqmenumodel/src/CMakeLists.txt
@@ -15,7 +15,6 @@ set(QMENUMODEL_SRC
     unitymenuactionevents.cpp
     unitymenumodel.cpp
     unitymenumodelevents.cpp
-    unitythemediconprovider.cpp
     gtk/gtkactionmuxer.c
     gtk/gtkactionmuxer.h
     gtk/gtkactionobservable.c
@@ -65,7 +64,6 @@ set(QMENUMODEL_HEADERS
     qstateaction.h
     unitymenuaction.h
     unitymenumodel.h
-    unitythemediconprovider.h
 )
 
 set(INCLUDEDIR qmenumodel)
diff --git a/libqmenumodel/src/unitymenumodel.cpp b/libqmenumodel/src/unitymenumodel.cpp
index cc6d317..d457cad 100644
--- a/libqmenumodel/src/unitymenumodel.cpp
+++ b/libqmenumodel/src/unitymenumodel.cpp
@@ -329,9 +329,6 @@ ActionStateParser* UnityMenuModel::actionStateParser() const
 void UnityMenuModel::setActionStateParser(ActionStateParser* actionStateParser)
 {
     if (priv->actionStateParser != actionStateParser) {
-        if (priv->actionStateParser && priv->actionStateParser->parent() == this) {
-            delete priv->actionStateParser;
-        }
         priv->actionStateParser = actionStateParser;
         Q_EMIT actionStateParserChanged(actionStateParser);
     }
diff --git a/libqmenumodel/src/unitythemediconprovider.cpp b/libqmenumodel/src/unitythemediconprovider.cpp
deleted file mode 100644
index 69afd76..0000000
--- a/libqmenumodel/src/unitythemediconprovider.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Lars Uebernickel <lars.uebernickel@canonical.com>
- */
-
-#include "unitythemediconprovider.h"
-
-#include <QIcon>
-
-UnityThemedIconProvider::UnityThemedIconProvider():
-  QQuickImageProvider(QQuickImageProvider::Pixmap)
-{
-}
-
-#include <QtDebug>
-
-QPixmap UnityThemedIconProvider::requestPixmap(const QString &id, QSize *size, const QSize &requestedSize)
-{
-  QPixmap pixmap = QIcon::fromTheme(id).pixmap(requestedSize.isValid() ? requestedSize : QSize(32, 32));
-  *size = pixmap.size();
-  return pixmap;
-}
diff --git a/libqmenumodel/src/unitythemediconprovider.h b/libqmenumodel/src/unitythemediconprovider.h
deleted file mode 100644
index 7e71ea8..0000000
--- a/libqmenumodel/src/unitythemediconprovider.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Lars Uebernickel <lars.uebernickel@canonical.com>
- */
-
-#ifndef UNITY_THEMED_ICON_PROVIDER_H
-#define UNITY_THEMED_ICON_PROVIDER_H
-
-#include <QQuickImageProvider>
-
-class UnityThemedIconProvider: public QQuickImageProvider
-{
-public:
-  UnityThemedIconProvider();
-  QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize);
-};
-
-#endif
diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt
index 5510258..cb16fc0 100644
--- a/tests/client/CMakeLists.txt
+++ b/tests/client/CMakeLists.txt
@@ -57,9 +57,9 @@ declare_test(menuchangestest)
 declare_test(modeltest)
 declare_test(actiongrouptest)
 declare_test(qmltest)
-declare_simple_test(convertertest)
-declare_simple_test(modelsignalstest)
-declare_simple_test(treetest)
+declare_test(convertertest)
+declare_test(modelsignalstest)
+declare_test(treetest)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qmlfiles.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/qmlfiles.h)