summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2013-12-19 13:38:31 +0200
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2013-12-19 14:41:42 +0200
commitdcf57ae33cbe173724f7f18d94c3d67cac27fac1 (patch)
tree611607f6a4263a4808fb84b93b2d19d363a20549 /examples
parentceda9bb5f39305d8f6467f574c7c7693b8a779f8 (diff)
Documentation and example fixes
Task-id: QTRD-2744 Change-Id: I901f05b737e24c363d7ed897e1baadc9f9a03333 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/qmlbars/qml/qmlbars/main.qml1
-rw-r--r--examples/qmlcustominput/qml/qmlcustominput/main.qml1
-rw-r--r--examples/qmlscatter/doc/src/qmlscatter.qdoc7
-rw-r--r--examples/qmlscatter/qml/qmlscatter/main.qml1
-rw-r--r--examples/qmlsurface/qml/qmlsurface/main.qml1
5 files changed, 6 insertions, 5 deletions
diff --git a/examples/qmlbars/qml/qmlbars/main.qml b/examples/qmlbars/qml/qmlbars/main.qml
index 1f8c1a3d..0581f834 100644
--- a/examples/qmlbars/qml/qmlbars/main.qml
+++ b/examples/qmlbars/qml/qmlbars/main.qml
@@ -27,7 +27,6 @@ Item {
id: mainview
width: 1280
height: 1024
- visible: true
property int buttonLayoutHeight: 180;
state: Screen.width < Screen.height ? "portrait" : "landscape"
diff --git a/examples/qmlcustominput/qml/qmlcustominput/main.qml b/examples/qmlcustominput/qml/qmlcustominput/main.qml
index 2a235986..54ec3342 100644
--- a/examples/qmlcustominput/qml/qmlcustominput/main.qml
+++ b/examples/qmlcustominput/qml/qmlcustominput/main.qml
@@ -25,7 +25,6 @@ Item {
id: mainView
width: 1280
height: 720
- visible: true
Data {
id: graphData
diff --git a/examples/qmlscatter/doc/src/qmlscatter.qdoc b/examples/qmlscatter/doc/src/qmlscatter.qdoc
index b0f1fd1f..06719ffc 100644
--- a/examples/qmlscatter/doc/src/qmlscatter.qdoc
+++ b/examples/qmlscatter/doc/src/qmlscatter.qdoc
@@ -86,10 +86,15 @@
The last \c import just imports all the qml files in the same directory as our \c {main.qml},
because that's where \c newbutton.qml and \c data.qml are.
- Then we create our main \c Item, call it \c mainView and set it visible:
+ Then we create our main \c Item and call it \c mainView:
\snippet ../examples/qmlscatter/qml/qmlscatter/main.qml 1
+ \note The Qt Creator application wizard will set a \c Rectangle item as the main item, which
+ is opaque white by default. This doesn't work for us, because the graphs are rendered behind the other
+ QML elements. We change the main item type to \c Item, which is invisible. This way the graph is
+ not covered by the main item.
+
Then we'll add another \c Item inside it, and call it \c dataView. This will be the item to hold
the Scatter3D graph. We'll anchor it to the parent bottom:
diff --git a/examples/qmlscatter/qml/qmlscatter/main.qml b/examples/qmlscatter/qml/qmlscatter/main.qml
index 22eab76b..62727f84 100644
--- a/examples/qmlscatter/qml/qmlscatter/main.qml
+++ b/examples/qmlscatter/qml/qmlscatter/main.qml
@@ -26,7 +26,6 @@ import "."
//! [1]
Item {
id: mainView
- visible: true
//! [1]
//! [4]
diff --git a/examples/qmlsurface/qml/qmlsurface/main.qml b/examples/qmlsurface/qml/qmlsurface/main.qml
index 07a07891..9f37a3f5 100644
--- a/examples/qmlsurface/qml/qmlsurface/main.qml
+++ b/examples/qmlsurface/qml/qmlsurface/main.qml
@@ -25,7 +25,6 @@ Item {
id: mainview
width: 1280
height: 720
- visible: true
property int buttonMaximumWidth: surfaceGridToggle.width
property int buttonMinimumHeight: seriesToggle.height