Unity

Merge lp:~unity-team/unity/phablet.release-162 into lp:unity/phablet

  1. phablet.release-162
  2. Merge into phablet
Proposed by Michał Sawicz
Status: Merged
Approved by: Albert Astals Cid
Approved revision: no longer in the source branch.
Merged at revision: 469
Proposed branch: lp:~unity-team/unity/phablet.release-162
Merge into: lp:unity/phablet
Diff against target: 156 lines (+33/-4)
9 files modified
debian/changelog (+17/-0)
debian/control (+1/-1)
plugins/HudClient/CMakeLists.txt (+1/-1)
plugins/HudClient/plugin.cpp (+2/-0)
plugins/Unity/CMakeLists.txt (+1/-1)
plugins/Unity/plugin.cpp (+2/-0)
tests/qmluitests/qml/HudClient/CMakeLists.txt (+1/-1)
tests/qmluitests/qml/HudClient/fake_hud_plugin.cpp (+2/-0)
tests/qmluitests/qml/HudClient/fake_libhud_client.cpp (+6/-0)
To merge this branch: bzr merge lp:~unity-team/unity/phablet.release-162
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Albert Astals Cid (community) Approve
Review via email: mp+153578@code.launchpad.net

Commit message

release 1.62

  * Use one SpecialItem in HUD AppStack
  * Remove outdated manual tests
  * Improve build scripts
  * Hook up other HUD Toolbar actions
  * Tests for:
    * HUD
    * Time.js
    * AnimationControllerWithSignals
    * Carousel
  * Autopilot test framework
  * Force build-dep at python2.7

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:469
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/35/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/35/console
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/35/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/35/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/35/rebuild

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

FAILED: Continuous integration, rev:470
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/36/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/36/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/36/rebuild

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

FAILED: Continuous integration, rev:470
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/37/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/37/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/37/rebuild

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

FAILED: Continuous integration, rev:470
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/38/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/38/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/38/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/38/rebuild

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

PASSED: Continuous integration, rev:471
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/39/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/40/console
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/40/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/39/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/39/rebuild

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

FAILED: Continuous integration, rev:471
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/40/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/41/console
    None: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/40/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/40/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Tested in the nexus10, works fine

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

PASSED: Continuous integration, rev:471
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/43/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/44/console
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/44/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/43/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/43/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-03-08 14:56:17 +0000
3+++ debian/changelog 2013-03-15 16:59:22 +0000
4@@ -1,3 +1,20 @@
5+qml-phone-shell (1.62) quantal; urgency=low
6+
7+ * Use one SpecialItem in HUD AppStack
8+ * Remove outdated manual tests
9+ * Improve build scripts
10+ * Hook up other HUD Toolbar actions
11+ * Tests for:
12+ * HUD
13+ * Time.js
14+ * AnimationControllerWithSignals
15+ * Carousel
16+ * Autopilot test framework
17+ * Force build-dep at python2.7
18+ * Suppress warnings
19+
20+ -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 15 Mar 2013 16:26:22 +0100
21+
22 qml-phone-shell (1.61) quantal; urgency=low
23
24 * Rename ubuntu-browser to webbrowser-app.
25
26=== modified file 'debian/control'
27--- debian/control 2013-03-14 15:26:19 +0000
28+++ debian/control 2013-03-15 16:59:22 +0000
29@@ -30,7 +30,7 @@
30 ${misc:Depends},
31 qt-components-ubuntu (>= 0.1.5~),
32 qtdeclarative5-xmllistmodel-plugin,
33- qml2-dee-3,
34+ qtdeclarative5-dee-plugin,
35 indicators-client (>= 0.6.1),
36 indicators-client-plugin-network (>= 0.6.1),
37 indicators-client-plugin-sound (>= 0.6.1),
38
39=== modified file 'plugins/HudClient/CMakeLists.txt'
40--- plugins/HudClient/CMakeLists.txt 2013-02-08 11:09:10 +0000
41+++ plugins/HudClient/CMakeLists.txt 2013-03-15 16:59:22 +0000
42@@ -9,7 +9,7 @@
43 pkg_search_module(DEE dee-1.0 REQUIRED)
44 pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
45 pkg_search_module(HUDCLIENT hud-client-1 REQUIRED)
46-pkg_search_module(DEEQT libdee-qt5-3 REQUIRED)
47+pkg_search_module(DEEQT libdee-qt5 REQUIRED)
48 pkg_search_module(PULSE libpulse REQUIRED)
49
50 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -Wall -Wextra -std=c++11")
51
52=== modified file 'plugins/HudClient/plugin.cpp'
53--- plugins/HudClient/plugin.cpp 2013-01-30 15:11:46 +0000
54+++ plugins/HudClient/plugin.cpp 2013-03-15 16:59:22 +0000
55@@ -25,7 +25,9 @@
56
57 void HudQmlPlugin::registerTypes(const char *uri)
58 {
59+#ifndef GLIB_VERSION_2_36
60 g_type_init();
61+#endif
62
63 qmlRegisterType<DeeListModel>();
64
65
66=== modified file 'plugins/Unity/CMakeLists.txt'
67--- plugins/Unity/CMakeLists.txt 2013-02-06 20:42:49 +0000
68+++ plugins/Unity/CMakeLists.txt 2013-03-15 16:59:22 +0000
69@@ -6,7 +6,7 @@
70
71 # Dependencies
72 include(FindPkgConfig)
73-pkg_check_modules(QTDEE REQUIRED libdee-qt5-3)
74+pkg_check_modules(QTDEE REQUIRED libdee-qt5)
75 pkg_check_modules(UNITYCORE REQUIRED unity-core-6.0)
76
77 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
78
79=== modified file 'plugins/Unity/plugin.cpp'
80--- plugins/Unity/plugin.cpp 2013-02-11 16:58:54 +0000
81+++ plugins/Unity/plugin.cpp 2013-03-15 16:59:22 +0000
82@@ -53,7 +53,9 @@
83 void UnityPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
84 {
85 QQmlExtensionPlugin::initializeEngine(engine, uri);
86+#ifndef GLIB_VERSION_2_36
87 g_type_init();
88+#endif
89
90 QDBusConnection::sessionBus().registerService(DBUS_SERVICE);
91 BottomBarVisibilityCommunicatorShell *bottomBarVisibilityCommunicator = &BottomBarVisibilityCommunicatorShell::instance();
92
93=== modified file 'tests/qmluitests/qml/HudClient/CMakeLists.txt'
94--- tests/qmluitests/qml/HudClient/CMakeLists.txt 2013-03-05 17:17:40 +0000
95+++ tests/qmluitests/qml/HudClient/CMakeLists.txt 2013-03-15 16:59:22 +0000
96@@ -6,7 +6,7 @@
97 pkg_search_module(DEE dee-1.0 REQUIRED)
98 pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
99 pkg_search_module(HUDCLIENT hud-client-1 REQUIRED)
100-pkg_search_module(DEEQT libdee-qt5-3 REQUIRED)
101+pkg_search_module(DEEQT libdee-qt5 REQUIRED)
102 pkg_search_module(PULSE libpulse REQUIRED)
103
104 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -Wall -Wextra -std=c++11")
105
106=== modified file 'tests/qmluitests/qml/HudClient/fake_hud_plugin.cpp'
107--- tests/qmluitests/qml/HudClient/fake_hud_plugin.cpp 2013-03-05 15:00:13 +0000
108+++ tests/qmluitests/qml/HudClient/fake_hud_plugin.cpp 2013-03-15 16:59:22 +0000
109@@ -26,7 +26,9 @@
110
111 void FakeHudQmlPlugin::registerTypes(const char *uri)
112 {
113+#ifndef GLIB_VERSION_2_36
114 g_type_init();
115+#endif
116
117 qmlRegisterType<DeeListModel>();
118
119
120=== modified file 'tests/qmluitests/qml/HudClient/fake_libhud_client.cpp'
121--- tests/qmluitests/qml/HudClient/fake_libhud_client.cpp 2013-03-12 10:28:37 +0000
122+++ tests/qmluitests/qml/HudClient/fake_libhud_client.cpp 2013-03-15 16:59:22 +0000
123@@ -30,16 +30,19 @@
124
125 HudClientQuery *hud_client_query_new(const gchar *query)
126 {
127+ Q_UNUSED(query);
128 return 0;
129 }
130
131 DeeModel *hud_client_query_get_results_model(HudClientQuery *cquery)
132 {
133+ Q_UNUSED(cquery);
134 return 0;
135 }
136
137 DeeModel *hud_client_query_get_appstack_model(HudClientQuery *cquery)
138 {
139+ Q_UNUSED(cquery);
140 if (!appStackModel) {
141 appStackModel = dee_sequence_model_new();
142 dee_model_set_schema_full(appStackModel, appstack_model_schema, G_N_ELEMENTS(appstack_model_schema));
143@@ -51,11 +54,14 @@
144
145 void hud_client_query_set_appstack_app(HudClientQuery *cquery, const gchar *application_id)
146 {
147+ Q_UNUSED(cquery);
148 HudClientStub::m_lastSetAppStackApplicationId = application_id;
149 }
150
151 void hud_client_query_execute_toolbar_item(HudClientQuery *cquery, HudClientQueryToolbarItems item, guint timestamp)
152 {
153+ Q_UNUSED(cquery);
154+ Q_UNUSED(timestamp);
155 HudClientStub::m_lastExecutedToolbarItem = item;
156 }
157

Subscribers

People subscribed via source and target branches

to all changes: