From fa5d7c1aa69ee8b4cf49c5e3cfe291e2f503f815 Mon Sep 17 00:00:00 2001
From: Olivier Tilloy <olivier.tilloy@canonical.com>
Date: Mon, 8 Oct 2012 13:44:24 +0200
Subject: Call g_type_init() in the constructor for QDBusObject. This ensures
 it is always called where needed: clients don’t need to invoke it themselves.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/client/modeltest.cpp | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'tests/client/modeltest.cpp')

diff --git a/tests/client/modeltest.cpp b/tests/client/modeltest.cpp
index 542b38a..9f6ee76 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());
     }
 
-- 
cgit v1.2.3