aboutsummaryrefslogtreecommitdiff
path: root/tests/client/servicetest.cpp
diff options
context:
space:
mode:
authorRenato Araujo Oliveira Filho <renato.filho@canonical.com>2012-10-15 09:54:06 -0300
committerRenato Araujo Oliveira Filho <renato.filho@canonical.com>2012-10-15 09:54:06 -0300
commit5c56d1288ba905ab162246c65fffbc69a831a14e (patch)
tree5043b5daf97aa9e2bb2e87e7d5809b3a762e556e /tests/client/servicetest.cpp
parente243399cba32f939eccdcb55fe093b7c57f31161 (diff)
parent5999e7a42962140b6479995d77a178186b6b2fcc (diff)
downloadqmenumodel-5c56d1288ba905ab162246c65fffbc69a831a14e.tar.gz
qmenumodel-5c56d1288ba905ab162246c65fffbc69a831a14e.tar.bz2
qmenumodel-5c56d1288ba905ab162246c65fffbc69a831a14e.zip
Merged mainline.
Diffstat (limited to 'tests/client/servicetest.cpp')
-rw-r--r--tests/client/servicetest.cpp5
1 files changed, 0 insertions, 5 deletions
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());
}