diff options
| author | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-10-15 09:54:06 -0300 |
|---|---|---|
| committer | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-10-15 09:54:06 -0300 |
| commit | 5c56d1288ba905ab162246c65fffbc69a831a14e (patch) | |
| tree | 5043b5daf97aa9e2bb2e87e7d5809b3a762e556e /tests/client | |
| parent | e243399cba32f939eccdcb55fe093b7c57f31161 (diff) | |
| parent | 5999e7a42962140b6479995d77a178186b6b2fcc (diff) | |
| download | qmenumodel-5c56d1288ba905ab162246c65fffbc69a831a14e.tar.gz qmenumodel-5c56d1288ba905ab162246c65fffbc69a831a14e.tar.bz2 qmenumodel-5c56d1288ba905ab162246c65fffbc69a831a14e.zip | |
Merged mainline.
Diffstat (limited to 'tests/client')
| -rw-r--r-- | tests/client/actiongrouptest.cpp | 5 | ||||
| -rw-r--r-- | tests/client/menuchangestest.cpp | 5 | ||||
| -rw-r--r-- | tests/client/modeltest.cpp | 5 | ||||
| -rw-r--r-- | tests/client/servicetest.cpp | 5 |
4 files changed, 0 insertions, 20 deletions
diff --git a/tests/client/actiongrouptest.cpp b/tests/client/actiongrouptest.cpp index 958ddc7..116bd44 100644 --- a/tests/client/actiongrouptest.cpp +++ b/tests/client/actiongrouptest.cpp @@ -17,10 +17,6 @@ * Renato Araujo Oliveira Filho <renato@canonical.com> */ -extern "C" { -#include <glib-object.h> -} - #include "qdbusmenumodel.h" #include "qdbusactiongroup.h" #include "dbusmenuscript.h" @@ -42,7 +38,6 @@ private: private Q_SLOTS: void initTestCase() { - g_type_init(); Q_ASSERT(m_script.connect()); } diff --git a/tests/client/menuchangestest.cpp b/tests/client/menuchangestest.cpp index bc7dcbd..2015582 100644 --- a/tests/client/menuchangestest.cpp +++ b/tests/client/menuchangestest.cpp @@ -17,10 +17,6 @@ * Renato Araujo Oliveira Filho <renato@canonical.com> */ -extern "C" { -#include <glib-object.h> -} - #include "qdbusmenumodel.h" #include "dbusmenuscript.h" @@ -39,7 +35,6 @@ private: private Q_SLOTS: void initTestCase() { - g_type_init(); Q_ASSERT(m_script.connect()); } diff --git a/tests/client/modeltest.cpp b/tests/client/modeltest.cpp index 8f20bc3..03629ca 100644 --- a/tests/client/modeltest.cpp +++ b/tests/client/modeltest.cpp @@ -17,10 +17,6 @@ * Renato Araujo Oliveira Filho <renato@canonical.com> */ -extern "C" { -#include <glib-object.h> -} - #include "qdbusmenumodel.h" #include "dbusmenuscript.h" @@ -39,7 +35,6 @@ private: private Q_SLOTS: void initTestCase() { - g_type_init(); Q_ASSERT(m_script.connect()); } diff --git a/tests/client/servicetest.cpp b/tests/client/servicetest.cpp index d34ba79..a8b0c2a 100644 --- a/tests/client/servicetest.cpp +++ b/tests/client/servicetest.cpp @@ -17,10 +17,6 @@ * Renato Araujo Oliveira Filho <renato@canonical.com> */ -extern "C" { -#include <glib-object.h> -} - #include "qdbusmenumodel.h" #include "dbusmenuscript.h" @@ -46,7 +42,6 @@ private: private Q_SLOTS: void initTestCase() { - g_type_init(); Q_ASSERT(m_script.connect()); } |