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

Proposed by Kevin Funk on 2015-06-02
Status: Work in progress
Proposed branch: lp:~kfunk/libdbusmenu-qt/libdbusmenu-qt
Merge into: lp:libdbusmenu-qt
Diff against target: 62 lines (+0/-7)
7 files modified
src/dbusmenu_p.cpp (+0/-1)
src/dbusmenuexporter.cpp (+0/-1)
src/dbusmenuexporterdbus_p.cpp (+0/-1)
tests/dbusmenuexportertest.cpp (+0/-1)
tests/dbusmenuimportertest.cpp (+0/-1)
tests/dbusmenushortcuttest.cpp (+0/-1)
tests/testutils.cpp (+0/-1)
To merge this branch: bzr merge lp:~kfunk/libdbusmenu-qt/libdbusmenu-qt
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) 2015-06-02 Needs Fixing on 2016-02-17
Review via email: mp+260870@code.launchpad.net
To post a comment you must log in.
Albert Astals Cid (aacid) wrote :
Download full text (3.7 KiB)

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...

Read more...

review: Needs Fixing
Albert Astals Cid (aacid) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/dbusmenu_p.cpp'
2--- src/dbusmenu_p.cpp 2011-06-20 15:20:18 +0000
3+++ src/dbusmenu_p.cpp 2015-06-02 18:23:48 +0000
4@@ -91,4 +91,3 @@
5 delete this;
6 }
7
8-#include "dbusmenu_p.moc"
9
10=== modified file 'src/dbusmenuexporter.cpp'
11--- src/dbusmenuexporter.cpp 2012-10-24 14:43:10 +0000
12+++ src/dbusmenuexporter.cpp 2015-06-02 18:23:48 +0000
13@@ -503,4 +503,3 @@
14 return d->m_dbusObject->status();
15 }
16
17-#include "dbusmenuexporter.moc"
18
19=== modified file 'src/dbusmenuexporterdbus_p.cpp'
20--- src/dbusmenuexporterdbus_p.cpp 2011-08-29 14:51:01 +0000
21+++ src/dbusmenuexporterdbus_p.cpp 2015-06-02 18:23:48 +0000
22@@ -183,4 +183,3 @@
23 }
24
25
26-#include "dbusmenuexporterdbus_p.moc"
27
28=== modified file 'tests/dbusmenuexportertest.cpp'
29--- tests/dbusmenuexportertest.cpp 2012-01-23 14:02:42 +0000
30+++ tests/dbusmenuexportertest.cpp 2015-06-02 18:23:48 +0000
31@@ -811,4 +811,3 @@
32 QCOMPARE(result, img);
33 }
34
35-#include "dbusmenuexportertest.moc"
36
37=== modified file 'tests/dbusmenuimportertest.cpp'
38--- tests/dbusmenuimportertest.cpp 2012-03-29 15:32:42 +0000
39+++ tests/dbusmenuimportertest.cpp 2015-06-02 18:23:48 +0000
40@@ -340,4 +340,3 @@
41 QVERIFY(outputAction->isEnabled());
42 }
43
44-#include "dbusmenuimportertest.moc"
45
46=== modified file 'tests/dbusmenushortcuttest.cpp'
47--- tests/dbusmenushortcuttest.cpp 2011-04-12 09:12:18 +0000
48+++ tests/dbusmenushortcuttest.cpp 2015-06-02 18:23:48 +0000
49@@ -82,4 +82,3 @@
50 QCOMPARE(sequence.toString(), keySequence.toString());
51 }
52
53-#include "dbusmenushortcuttest.moc"
54
55=== modified file 'tests/testutils.cpp'
56--- tests/testutils.cpp 2010-09-20 08:55:12 +0000
57+++ tests/testutils.cpp 2015-06-02 18:23:48 +0000
58@@ -31,4 +31,3 @@
59 }
60 }
61
62-#include "testutils.moc"

Subscribers

People subscribed via source and target branches

to all changes: