aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorOlivier Tilloy <olivier.tilloy@canonical.com>2012-10-15 12:40:44 +0000
committerTarmac <>2012-10-15 12:40:44 +0000
commit5999e7a42962140b6479995d77a178186b6b2fcc (patch)
tree3927d59c3a5edf7362bb4de937ae11fe7291b029 /tests
parent46b559bd4b2229332c1858939be765939fc6fb05 (diff)
parent4366f70b6d6f5f1788353dd74df15e616365d25b (diff)
downloadqmenumodel-5999e7a42962140b6479995d77a178186b6b2fcc.tar.gz
qmenumodel-5999e7a42962140b6479995d77a178186b6b2fcc.tar.bz2
qmenumodel-5999e7a42962140b6479995d77a178186b6b2fcc.zip
Expose a C++ library, and separate into 3 binary packages:
- libqmenumodel0: C++ library - libqmenumodel-dev: development headers for the C++ library - qmenumodel-qml: QML module. Approved by Renato Araujo Oliveira Filho, jenkins.
Diffstat (limited to 'tests')
-rw-r--r--tests/client/actiongrouptest.cpp5
-rw-r--r--tests/client/menuchangestest.cpp5
-rw-r--r--tests/client/modeltest.cpp5
-rw-r--r--tests/client/servicetest.cpp5
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 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());
}
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());
}