qtorganizer5-eds

Merge lp:~renatofilho/qtorganizer5-eds/qt5.0.2 into lp:qtorganizer5-eds

  1. qt5.0.2
  2. Merge into trunk
Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 36
Merged at revision: 35
Proposed branch: lp:~renatofilho/qtorganizer5-eds/qt5.0.2
Merge into: lp:qtorganizer5-eds
Diff against target: 116 lines (+17/-1)
9 files modified
qorganizer/qorganizer-eds-collection-engineid.cpp (+2/-0)
qorganizer/qorganizer-eds-engineid.cpp (+3/-0)
qorganizer/qorganizer-eds-engineid.h (+1/-0)
qorganizer/qorganizer-eds-factory.cpp (+2/-0)
qorganizer/qorganizer-eds-fetchrequestdata.cpp (+3/-0)
qorganizer/qorganizer-eds-savecollectionrequestdata.cpp (+2/-0)
qorganizer/qorganizer-eds-source-registry.cpp (+2/-0)
qorganizer/qorganizer-eds-viewwatcher.cpp (+1/-0)
tests/unittest/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~renatofilho/qtorganizer5-eds/qt5.0.2
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+208188@code.launchpad.net

Commit message

Fixed compilation with Qt5.2

To post a comment you must log in.
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

Are there any related MPs required for this MP to build/function as expected? NO
Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes): YES
Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator? YES
Did you successfully run all tests found in your component's Test Plan : (https://wiki.ubuntu.com/Process/Merges/TestPlan/qtorganizer5-eds) on device or emulator? YES
If you changed the UI, was the change specified/approved by design? NO UI CHANGE
If you changed the packaging (debian), did you subscribe a core-dev to this MP? NO PACKAGE CHANGE

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:35
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/96/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-amd64-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-armhf-ci/83
        deb: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-armhf-ci/83/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-i386-ci/83/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/96/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:35
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/98/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-amd64-ci/85/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-armhf-ci/85
        deb: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-armhf-ci/85/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-i386-ci/85/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/98/rebuild

review: Needs Fixing (continuous-integration)
lp:~renatofilho/qtorganizer5-eds/qt5.0.2 updated
36. By Renato Araujo Oliveira Filho

Does not wait for EDS to finish during the tests.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:36
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/100/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-amd64-ci/87
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-armhf-ci/87
        deb: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-armhf-ci/87/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-i386-ci/87

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/100/rebuild

review: Approve (continuous-integration)
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
No real code changes, just missing include files.

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qorganizer/qorganizer-eds-collection-engineid.cpp'
2--- qorganizer/qorganizer-eds-collection-engineid.cpp 2013-12-01 21:48:44 +0000
3+++ qorganizer/qorganizer-eds-collection-engineid.cpp 2014-02-25 18:46:50 +0000
4@@ -19,6 +19,8 @@
5 #include "qorganizer-eds-collection-engineid.h"
6 #include "qorganizer-eds-engineid.h"
7
8+#include <QtCore/QDebug>
9+
10 QOrganizerEDSCollectionEngineId::QOrganizerEDSCollectionEngineId(ESource *source)
11 : m_esource(source)
12 {
13
14=== modified file 'qorganizer/qorganizer-eds-engineid.cpp'
15--- qorganizer/qorganizer-eds-engineid.cpp 2014-02-02 13:19:46 +0000
16+++ qorganizer/qorganizer-eds-engineid.cpp 2014-02-25 18:46:50 +0000
17@@ -18,6 +18,9 @@
18
19 #include "qorganizer-eds-engineid.h"
20
21+#include <QtCore/QStringList>
22+#include <QtCore/QDebug>
23+
24 using namespace QtOrganizer;
25
26 QOrganizerEDSEngineId::QOrganizerEDSEngineId()
27
28=== modified file 'qorganizer/qorganizer-eds-engineid.h'
29--- qorganizer/qorganizer-eds-engineid.h 2014-02-02 13:19:46 +0000
30+++ qorganizer/qorganizer-eds-engineid.h 2014-02-25 18:46:50 +0000
31@@ -22,6 +22,7 @@
32 #include "qorganizer-eds-collection-engineid.h"
33
34 #include <QtOrganizer/QOrganizerItemEngineId>
35+#include <QtOrganizer/QOrganizerItemId>
36
37 #include <libecal/libecal.h>
38
39
40=== modified file 'qorganizer/qorganizer-eds-factory.cpp'
41--- qorganizer/qorganizer-eds-factory.cpp 2013-08-16 02:52:55 +0000
42+++ qorganizer/qorganizer-eds-factory.cpp 2014-02-25 18:46:50 +0000
43@@ -3,6 +3,8 @@
44 #include "qorganizer-eds-engineid.h"
45 #include "qorganizer-eds-engine.h"
46
47+#include <QtCore/QDebug>
48+
49 using namespace QtOrganizer;
50
51 QOrganizerManagerEngine* QOrganizerEDSFactory::engine(const QMap<QString, QString>& parameters, QOrganizerManager::Error* error)
52
53=== modified file 'qorganizer/qorganizer-eds-fetchrequestdata.cpp'
54--- qorganizer/qorganizer-eds-fetchrequestdata.cpp 2014-02-20 19:22:19 +0000
55+++ qorganizer/qorganizer-eds-fetchrequestdata.cpp 2014-02-25 18:46:50 +0000
56@@ -18,7 +18,10 @@
57
58 #include "qorganizer-eds-fetchrequestdata.h"
59
60+#include <QtCore/QDebug>
61+
62 #include <QtOrganizer/QOrganizerItemFetchRequest>
63+#include <QtOrganizer/QOrganizerItemCollectionFilter>
64
65 using namespace QtOrganizer;
66
67
68=== modified file 'qorganizer/qorganizer-eds-savecollectionrequestdata.cpp'
69--- qorganizer/qorganizer-eds-savecollectionrequestdata.cpp 2013-12-11 13:16:50 +0000
70+++ qorganizer/qorganizer-eds-savecollectionrequestdata.cpp 2014-02-25 18:46:50 +0000
71@@ -20,6 +20,8 @@
72 #include "qorganizer-eds-enginedata.h"
73 #include "qorganizer-eds-source-registry.h"
74
75+#include <QtCore/QDebug>
76+
77 #include <QtOrganizer/QOrganizerManagerEngine>
78 #include <QtOrganizer/QOrganizerCollectionSaveRequest>
79 #include <QtOrganizer/QOrganizerCollectionChangeSet>
80
81=== modified file 'qorganizer/qorganizer-eds-source-registry.cpp'
82--- qorganizer/qorganizer-eds-source-registry.cpp 2013-12-05 16:08:18 +0000
83+++ qorganizer/qorganizer-eds-source-registry.cpp 2014-02-25 18:46:50 +0000
84@@ -1,5 +1,7 @@
85 #include "qorganizer-eds-source-registry.h"
86
87+#include <QtCore/QDebug>
88+
89 using namespace QtOrganizer;
90
91 SourceRegistry::SourceRegistry(QObject *parent)
92
93=== modified file 'qorganizer/qorganizer-eds-viewwatcher.cpp'
94--- qorganizer/qorganizer-eds-viewwatcher.cpp 2013-12-04 01:35:37 +0000
95+++ qorganizer/qorganizer-eds-viewwatcher.cpp 2014-02-25 18:46:50 +0000
96@@ -22,6 +22,7 @@
97 #include "qorganizer-eds-engineid.h"
98
99 #include <QtCore/QCoreApplication>
100+#include <QtCore/QDebug>
101
102 #include <QtOrganizer/QOrganizerAbstractRequest>
103 #include <QtOrganizer/QOrganizerManagerEngine>
104
105=== modified file 'tests/unittest/CMakeLists.txt'
106--- tests/unittest/CMakeLists.txt 2014-02-20 21:47:21 +0000
107+++ tests/unittest/CMakeLists.txt 2014-02-25 18:46:50 +0000
108@@ -23,7 +23,7 @@
109 add_test(${TESTNAME}
110 ${DBUS_RUNNER} --keep-env
111 --task ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME} --task-name ${TESTNAME} --wait-until-complete --wait-for=org.gnome.evolution.dataserver.Calendar4
112- --task ${EVOLUTION_CALENDAR_FACTORY} --task-name "evolution" -r --wait-until-complete --wait-for=${EVOLUTION_SOURCE_SERVICE_NAME}
113+ --task ${EVOLUTION_CALENDAR_FACTORY} --task-name "evolution" -r --wait-for=${EVOLUTION_SOURCE_SERVICE_NAME}
114 --task ${EVOLUTION_SOURCE_REGISTRY} --task-name "source-registry" --wait-for=org.gtk.vfs.Daemon -r
115 --task ${GVFSD} --task-name "gvfsd" -r)
116 update_test_properties(${TESTNAME})

Subscribers

People subscribed via source and target branches