aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick/tutorials/gettingStartedQml/core/MenuBar.qml
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-03-20 09:13:42 +0100
committerSergio Ahumada <sergio.ahumada@digia.com>2013-03-20 09:14:33 +0100
commitd815621963cee5571ed93fb89561c4884a685b6b (patch)
tree4c60b5f69eff56fd324e4203d006e1df677670ce /examples/quick/tutorials/gettingStartedQml/core/MenuBar.qml
parent9b25a6f39ee59fe1bb4352a5f2e4ef4a91f1f2c3 (diff)
parent471645f6dba6a21b85cb6788f0a0a07b6d5a804a (diff)
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle Change-Id: I6178a580b4c99aded1a69032a02169cff502b71d
Diffstat (limited to 'examples/quick/tutorials/gettingStartedQml/core/MenuBar.qml')
-rw-r--r--examples/quick/tutorials/gettingStartedQml/core/MenuBar.qml3
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/quick/tutorials/gettingStartedQml/core/MenuBar.qml b/examples/quick/tutorials/gettingStartedQml/core/MenuBar.qml
index c6edcab836..b53fc1b45a 100644
--- a/examples/quick/tutorials/gettingStartedQml/core/MenuBar.qml
+++ b/examples/quick/tutorials/gettingStartedQml/core/MenuBar.qml
@@ -39,6 +39,7 @@
****************************************************************************/
import QtQuick 2.0
+import QtQml.Models 2.1
Rectangle {
id: menuBar
@@ -128,7 +129,7 @@ Rectangle {
}
}
//a list of visual items already have delegates handling their display
- VisualItemModel {
+ ObjectModel {
id: menuListModel
FileMenu {