aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorOlivier Tilloy <olivier.tilloy@canonical.com>2012-10-05 15:26:44 +0000
committerTarmac <>2012-10-05 15:26:44 +0000
commita03e7e775a9751f87efb8fd7acf226b5eb25f4e3 (patch)
tree7ca7cfb2dd1e42c6c0d45918087c23fbf09dc5ae /examples
parentc3fbab270f60fc374bae50e787e0b2046f127a07 (diff)
parent900b75e3528ea23b9158c52e43bca905a1ee5e5f (diff)
downloadqmenumodel-a03e7e775a9751f87efb8fd7acf226b5eb25f4e3.tar.gz
qmenumodel-a03e7e775a9751f87efb8fd7acf226b5eb25f4e3.tar.bz2
qmenumodel-a03e7e775a9751f87efb8fd7acf226b5eb25f4e3.zip
Port to Qt5.
To compile and test, one needs to install the qt5-meta-minimal package from the Canonical Qt5 Edgers PPA (https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-beta1). This installs Qt5 in /opt/qt5/. cmake needs to be invoked with CMAKE_PREFIX_PATH=/opt/qt5/lib/cmake, and /opt/qt5/bin needs to be added to $PATH if one wants to generate the API documentation using qdoc.. Approved by Renato Araujo Oliveira Filho, jenkins.
Diffstat (limited to 'examples')
-rw-r--r--examples/README6
-rw-r--r--examples/render-menumodel.qml4
2 files changed, 5 insertions, 5 deletions
diff --git a/examples/README b/examples/README
index c2516e3..1ecac0e 100644
--- a/examples/README
+++ b/examples/README
@@ -4,8 +4,8 @@ QML binding in applications.
To export an example menu model on the bus, run 'exportmenu.py'.
To render this menu in a QML application, run 'render-menumodel.qml' in
-qmlviewer. You will need to inform qmlviewer of the location of the QMenuModel
-if it’s not installed system-wide, e.g.:
+qmlscene. You will need to inform qmlscene of the location of the QMenuModel
+plugin if it’s not installed system-wide, e.g.:
- qmlviewer -I libqmenumodel examples/render-menumodel.qml
+ qmlscene -I libqmenumodel examples/render-menumodel.qml
diff --git a/examples/render-menumodel.qml b/examples/render-menumodel.qml
index 45daf0d..1ad41c5 100644
--- a/examples/render-menumodel.qml
+++ b/examples/render-menumodel.qml
@@ -2,7 +2,7 @@
// under the well-known name com.canonical.testmenu and at the object path
// /com/canonical/testmenu.
-import QtQuick 1.1
+import QtQuick 2.0
import QMenuModel 0.1
Item {
@@ -129,7 +129,7 @@ Item {
x: 5
y: 5
anchors.margins: 4
- font.pixelSize: 12
+ font.pixelSize: 11
}
}
}