Ubuntu UI Toolkit

Merge lp:~daker/ubuntu-ui-toolkit/fix.1660604 into lp:ubuntu-ui-toolkit/staging

  1. fix.1660604
  2. Merge into staging
Proposed by Adnane Belmadiaf on 2017-01-31
Status: Merged
Approved by: Christian Dywan on 2017-02-01
Approved revision: 2169
Merged at revision: 2168
Proposed branch: lp:~daker/ubuntu-ui-toolkit/fix.1660604
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 62 lines (+6/-3)
3 files modified
src/UbuntuToolkit/menu.cpp (+2/-1)
src/UbuntuToolkit/menubar.cpp (+2/-1)
src/UbuntuToolkit/menugroup.cpp (+2/-1)
To merge this branch: bzr merge lp:~daker/ubuntu-ui-toolkit/fix.1660604
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve on 2017-02-01
Christian Dywan 2017-01-31 Approve on 2017-01-31
Review via email: mp+315996@code.launchpad.net

Commit Message

Fix the import statement for Menu, MenuBar and MenuGroup

Description of the Change

Fix the import statement for Menu, MenuBar and MenuGroup

To post a comment you must log in.
Christian Dywan (kalikiana) wrote :

Nice catch! Thanks a lot1

review: Approve
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-autolanding/610/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1641/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1426
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1391
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/205
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/916/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7578
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7576
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7577
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7579

review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/UbuntuToolkit/menu.cpp'
2--- src/UbuntuToolkit/menu.cpp 2016-09-09 18:16:57 +0000
3+++ src/UbuntuToolkit/menu.cpp 2017-01-31 14:44:40 +0000
4@@ -303,7 +303,7 @@
5
6 /*!
7 * \qmltype Menu
8- * \inqmlmodule Ubuntu.Components
9+ * \inqmlmodule Ubuntu.Components.Labs
10 * \ingroup ubuntu
11 * \brief Menu defines a context menu or submenu structure of a MenuBar
12 *
13@@ -311,6 +311,7 @@
14 * \qml
15 * import QtQuick 2.4
16 * import Ubuntu.Components 1.3
17+ * import Ubuntu.Components.Labs 1.0
18 * Menu {
19 * text: "&File"
20 *
21
22=== modified file 'src/UbuntuToolkit/menubar.cpp'
23--- src/UbuntuToolkit/menubar.cpp 2016-09-09 17:49:07 +0000
24+++ src/UbuntuToolkit/menubar.cpp 2017-01-31 14:44:40 +0000
25@@ -104,7 +104,7 @@
26
27 /*!
28 * \qmltype MenuBar
29- * \inqmlmodule Ubuntu.Components 1.3
30+ * \inqmlmodule Ubuntu.Components.Labs
31 * \ingroup ubuntu
32 * \brief MenuBar defines an application menu bar structure
33 *
34@@ -112,6 +112,7 @@
35 * \qml
36 * import QtQuick 2.4
37 * import Ubuntu.Components 1.3
38+ * import Ubuntu.Components.Labs 1.0
39 * MainView {
40 * MenuBar {
41 * Menu {
42
43=== modified file 'src/UbuntuToolkit/menugroup.cpp'
44--- src/UbuntuToolkit/menugroup.cpp 2016-09-09 17:49:07 +0000
45+++ src/UbuntuToolkit/menugroup.cpp 2017-01-31 14:44:40 +0000
46@@ -23,7 +23,7 @@
47
48 /*!
49 * \qmltype MenuGroup
50- * \inqmlmodule Ubuntu.Components
51+ * \inqmlmodule Ubuntu.Components.Labs
52 * \ingroup ubuntu
53 * \brief Logical list of items for a menu.
54 *
55@@ -31,6 +31,7 @@
56 * \qml
57 * import QtQuick 2.4
58 * import Ubuntu.Components 1.3
59+ * import Ubuntu.Components.Labs 1.0
60 * Menu {
61 * text: "Edit"
62 *

Subscribers

People subscribed via source and target branches