Merged mainline.

6 files changed, 18 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 0261fef..60de143 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+qmenumodel (0.1.6) quantal; urgency=low
+
+  [ Renato Araujo Oliveira Filho ]
+  * Changed the 'g_bus_watch_name' flag to auto start the service.
+  * Replaced gchar ⇄  QString conversion function, from Latin1 to Utf8.
+  * Use the correct function "g_action_group_change_action_state" to change the
+    action state.
+
+  [ Olivier Tilloy ]
+  * Migrate all the scripts to python3.
+
+ -- Olivier Tilloy <olivier.tilloy@canonical.com>  Wed, 31 Oct 2012 18:19:15 +0100
+
 qmenumodel (0.1.5) quantal; urgency=low
 
   [ Renato Araujo Oliveira Filho]
diff --git a/tests/client/actiongrouptest.cpp b/tests/client/actiongrouptest.cpp
index 116bd44..5f1bf60 100644
--- a/tests/client/actiongrouptest.cpp
+++ b/tests/client/actiongrouptest.cpp
@@ -38,7 +38,7 @@ private:
 private Q_SLOTS:
     void initTestCase()
     {
-        Q_ASSERT(m_script.connect());
+        QVERIFY(m_script.connect());
     }
 
     void cleanupTestCase()
diff --git a/tests/client/menuchangestest.cpp b/tests/client/menuchangestest.cpp
index 2015582..6ef5879 100644
--- a/tests/client/menuchangestest.cpp
+++ b/tests/client/menuchangestest.cpp
@@ -35,7 +35,7 @@ private:
 private Q_SLOTS:
     void initTestCase()
     {
-        Q_ASSERT(m_script.connect());
+        QVERIFY(m_script.connect());
     }
 
     void cleanupTestCase()
diff --git a/tests/client/modeltest.cpp b/tests/client/modeltest.cpp
index 93677db..2cb64b0 100644
--- a/tests/client/modeltest.cpp
+++ b/tests/client/modeltest.cpp
@@ -35,7 +35,7 @@ private:
 private Q_SLOTS:
     void initTestCase()
     {
-        Q_ASSERT(m_script.connect());
+        QVERIFY(m_script.connect());
     }
 
     void cleanupTestCase()
diff --git a/tests/client/qmltest.cpp b/tests/client/qmltest.cpp
index 4e6f288..ce77f6f 100644
--- a/tests/client/qmltest.cpp
+++ b/tests/client/qmltest.cpp
@@ -44,8 +44,7 @@ private:
 private Q_SLOTS:
     void initTestCase()
     {
-        g_type_init();
-        Q_ASSERT(m_script.connect());
+        QVERIFY(m_script.connect());
     }
 
     void cleanupTestCase()
diff --git a/tests/client/servicetest.cpp b/tests/client/servicetest.cpp
index a8b0c2a..4d238c4 100644
--- a/tests/client/servicetest.cpp
+++ b/tests/client/servicetest.cpp
@@ -42,7 +42,7 @@ private:
 private Q_SLOTS:
     void initTestCase()
     {
-        Q_ASSERT(m_script.connect());
+        QVERIFY(m_script.connect());
     }
 
     void cleanupTestCase()