Merge lp:~kfunk/libdbusmenu-qt/libdbusmenu-qt into lp:libdbusmenu-qt

[Kevin Funk]

[Albert Astals Cid (aacid)]

running dpkg-buildpackage on this branch fails

Linking CXX executable dbusmenuexportertest
CMakeFiles/dbusmenuexportertest.dir/dbusmenuexportertest.cpp.o: In function `ManualSignalSpy::ManualSignalSpy()':
/home/tsdgeos_work/moo/libdbusmenu-qt/tests/testutils.h:33: undefined reference to `vtable for ManualSignalSpy'
CMakeFiles/dbusmenuexportertest.dir/dbusmenuexportertest.cpp.o: In function `MenuFiller::MenuFiller(QMenu*)':
/home/tsdgeos_work/moo/libdbusmenu-qt/tests/testutils.h:84: undefined reference to `vtable for MenuFiller'
CMakeFiles/dbusmenuexportertest.dir/dbusmenuexportertest.cpp.o: In function `DBusMenuExporterTest::testDynamicSubMenu()':
/home/tsdgeos_work/moo/libdbusmenu-qt/tests/testutils.h:79: undefined reference to `vtable for MenuFiller'
/home/tsdgeos_work/moo/libdbusmenu-qt/tests/testutils.h:33: undefined reference to `vtable for ManualSignalSpy'
CMakeFiles/dbusmenuexportertest.dir/dbusmenuexportertest.cpp.o: In function `ManualSignalSpy::ManualSignalSpy()':
/home/tsdgeos_work/moo/libdbusmenu-qt/tests/testutils.h:33: undefined reference to `vtable for ManualSignalSpy'
CMakeFiles/dbusmenuexportertest.dir/dbusmenuexportertest.cpp.o: In function `DBusMenuExporterTest::testActivateAction()':
/home/tsdgeos_work/moo/libdbusmenu-qt/tests/testutils.h:33: undefined reference to `vtable for ManualSignalSpy'
CMakeFiles/dbusmenuexportertest.dir/dbusmenuexportertest.cpp.o: In function `ManualSignalSpy::ManualSignalSpy()':
/home/tsdgeos_work/moo/libdbusmenu-qt/tests/testutils.h:33: undefined reference to `vtable for ManualSignalSpy'
CMakeFiles/dbusmenuexportertest.dir/dbusmenuexportertest.cpp.o: In function `DBusMenuExporterTest::testSetStatus()':
/home/tsdgeos_work/moo/libdbusmenu-qt/tests/testutils.h:33: undefined reference to `vtable for ManualSignalSpy'
CMakeFiles/dbusmenuexportertest.dir/dbusmenuexportertest.cpp.o:/home/tsdgeos_work/moo/libdbusmenu-qt/tests/testutils.h:33: more undefined references to `vtable for ManualSignalSpy' follow
CMakeFiles/dbusmenuexportertest.dir/dbusmenuexportertest.cpp.o: In function `MenuFiller::~MenuFiller()':
/home/tsdgeos_work/moo/libdbusmenu-qt/tests/testutils.h:79: undefined reference to `vtable for MenuFiller'
CMakeFiles/dbusmenuexportertest.dir/dbusmenuexportertest.cpp.o: In function `MenuFiller::~MenuFiller()':
/home/tsdgeos_work/moo/libdbusmenu-qt/tests/testutils.h:79: undefined reference to `vtable for MenuFiller'
CMakeFiles/dbusmenuexportertest.dir/dbusmenuexportertest.cpp.o: In function `DBusMenuExporterTest::DBusMenuExporterTest()':
/home/tsdgeos_work/moo/libdbusmenu-qt/tests/dbusmenuexportertest.h:32: undefined reference to `vtable for DBusMenuExporterTest'
CMakeFiles/dbusmenuexportertest.dir/dbusmenuexportertest.cpp.o: In function `DBusMenuExporterTest::~DBusMenuExporterTest()':
/home/tsdgeos_work/moo/libdbusmenu-qt/tests/dbusmenuexportertest.h:32: undefined reference to `vtable for DBusMenuExporterTest'
/home/tsdgeos_work/moo/libdbusmenu-qt/tests/dbusmenuexportertest.h:32: undefined reference to `vtable for DBusMenuExporterTest'
../src/libdbusmenu-qt.so.2.6.0: undefined reference to `DBusMenuExporterDBus::ItemsPropertiesUpdated(QList<DBusMenuItem>, QList<DBusMenuItemKeys>)'
../src/libdbusme...

review: Needs Fixing

[Albert Astals Cid (aacid)]

Setting to Work in Progress, please set back to Needs Review when you fix the issue above.

Unmerged revisions

268. By Kevin Funk on 2015-06-02

Make work with CMake automoc

=== modified file 'src/dbusmenu_p.cpp'
--- src/dbusmenu_p.cpp	2011-06-20 15:20:18 +0000
+++ src/dbusmenu_p.cpp	2015-06-02 18:23:48 +0000
@@ -91,4 +91,3 @@
     delete this;
 }
 
-#include "dbusmenu_p.moc"

=== modified file 'src/dbusmenuexporter.cpp'
--- src/dbusmenuexporter.cpp	2012-10-24 14:43:10 +0000
+++ src/dbusmenuexporter.cpp	2015-06-02 18:23:48 +0000
@@ -503,4 +503,3 @@
     return d->m_dbusObject->status();
 }
 
-#include "dbusmenuexporter.moc"

=== modified file 'src/dbusmenuexporterdbus_p.cpp'
--- src/dbusmenuexporterdbus_p.cpp	2011-08-29 14:51:01 +0000
+++ src/dbusmenuexporterdbus_p.cpp	2015-06-02 18:23:48 +0000
@@ -183,4 +183,3 @@
 }
 
 
-#include "dbusmenuexporterdbus_p.moc"

=== modified file 'tests/dbusmenuexportertest.cpp'
--- tests/dbusmenuexportertest.cpp	2012-01-23 14:02:42 +0000
+++ tests/dbusmenuexportertest.cpp	2015-06-02 18:23:48 +0000
@@ -811,4 +811,3 @@
     QCOMPARE(result, img);
 }
 
-#include "dbusmenuexportertest.moc"

=== modified file 'tests/dbusmenuimportertest.cpp'
--- tests/dbusmenuimportertest.cpp	2012-03-29 15:32:42 +0000
+++ tests/dbusmenuimportertest.cpp	2015-06-02 18:23:48 +0000
@@ -340,4 +340,3 @@
     QVERIFY(outputAction->isEnabled());
 }
 
-#include "dbusmenuimportertest.moc"

=== modified file 'tests/dbusmenushortcuttest.cpp'
--- tests/dbusmenushortcuttest.cpp	2011-04-12 09:12:18 +0000
+++ tests/dbusmenushortcuttest.cpp	2015-06-02 18:23:48 +0000
@@ -82,4 +82,3 @@
     QCOMPARE(sequence.toString(), keySequence.toString());
 }
 
-#include "dbusmenushortcuttest.moc"

=== modified file 'tests/testutils.cpp'
--- tests/testutils.cpp	2010-09-20 08:55:12 +0000
+++ tests/testutils.cpp	2015-06-02 18:23:48 +0000
@@ -31,4 +31,3 @@
     }
 }
 
-#include "testutils.moc"