ubuntu-sdk-team team mailing list archive

[Adnane Belmadiaf <adnane002@xxxxxxxxx>]

Adnane Belmadiaf has proposed merging lp:~daker/ubuntu-ui-toolkit/fix.1660604 into lp:ubuntu-ui-toolkit/staging.

Commit message:
Fixed the import statement for Menu and MenuGroup

Requested reviews:
  Ubuntu SDK team (ubuntu-sdk-team)
Related bugs:
  Bug #1660604 in ubuntu-ui-toolkit (Ubuntu): "Wrong import statement for Menu/MenuGroup"
  https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1660604

For more details, see:
https://code.launchpad.net/~daker/ubuntu-ui-toolkit/fix.1660604/+merge/315996

Fixed the import statement for Menu and MenuGroup
-- 
Your team Ubuntu SDK team is requested to review the proposed merge of lp:~daker/ubuntu-ui-toolkit/fix.1660604 into lp:ubuntu-ui-toolkit/staging.

=== modified file 'src/UbuntuToolkit/menu.cpp'
--- src/UbuntuToolkit/menu.cpp	2016-09-09 18:16:57 +0000
+++ src/UbuntuToolkit/menu.cpp	2017-01-31 12:32:45 +0000
@@ -303,7 +303,7 @@
 
 /*!
  * \qmltype Menu
- * \inqmlmodule Ubuntu.Components
+ * \inqmlmodule Ubuntu.Components.Labs 1.0
  * \ingroup ubuntu
  * \brief Menu defines a context menu or submenu structure of a MenuBar
  *
@@ -311,6 +311,7 @@
  * \qml
  * import QtQuick 2.4
  * import Ubuntu.Components 1.3
+ * import Ubuntu.Components.Labs 1.0
  * Menu {
  *     text: "&File"
  *

=== modified file 'src/UbuntuToolkit/menugroup.cpp'
--- src/UbuntuToolkit/menugroup.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/menugroup.cpp	2017-01-31 12:32:45 +0000
@@ -23,7 +23,7 @@
 
 /*!
  * \qmltype MenuGroup
- * \inqmlmodule Ubuntu.Components
+ * \inqmlmodule Ubuntu.Components.Labs 1.0
  * \ingroup ubuntu
  * \brief Logical list of items for a menu.
  *
@@ -31,6 +31,7 @@
  * \qml
  * import QtQuick 2.4
  * import Ubuntu.Components 1.3
+ * import Ubuntu.Components.Labs 1.0
  * Menu {
  *     text: "Edit"
  *