diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-10 09:43:08 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-10 09:50:40 +0300 |
| commit | 690af005c131a1179bf36f64b7cba752db819842 (patch) | |
| tree | 89253f1f5819bce9e4c5bb366803da3cea6f29d4 | |
| parent | 4c52c13e5061d0959fa7a9c7cf96ff9fd880bfba (diff) | |
Mac snapshot and fixed to qmlscatter example
Change-Id: I8d03e81e2ab7b5cf1c894e568c57f3c64f96b07d
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| -rw-r--r-- | examples/qmlscatter/doc/images/qmlscatter-example.png | bin | 121892 -> 190076 bytes | |||
| -rw-r--r-- | examples/qmlscatter/doc/src/qmlscatter.qdoc | 2 | ||||
| -rw-r--r-- | examples/qmlscatter/main.cpp | 2 | ||||
| -rw-r--r-- | examples/qmlscatter/qml/qmlscatter/main.qml | 1 | ||||
| -rw-r--r-- | examples/qmlsurface/qml/qmlsurface/main.qml | 2 |
5 files changed, 4 insertions, 3 deletions
diff --git a/examples/qmlscatter/doc/images/qmlscatter-example.png b/examples/qmlscatter/doc/images/qmlscatter-example.png Binary files differindex 07efff7d..039c1efc 100644 --- a/examples/qmlscatter/doc/images/qmlscatter-example.png +++ b/examples/qmlscatter/doc/images/qmlscatter-example.png diff --git a/examples/qmlscatter/doc/src/qmlscatter.qdoc b/examples/qmlscatter/doc/src/qmlscatter.qdoc index 4306ee61..c0d207d8 100644 --- a/examples/qmlscatter/doc/src/qmlscatter.qdoc +++ b/examples/qmlscatter/doc/src/qmlscatter.qdoc @@ -43,7 +43,7 @@ \snippet ../examples/qmlscatter/main.cpp 0 This will help us when deploying the application to Android. We'll also change the application - to be shown fullscreen by replacing + to be shown maximized by replacing \code viewer.showExpanded(); \endcode diff --git a/examples/qmlscatter/main.cpp b/examples/qmlscatter/main.cpp index d339924b..e04ceab5 100644 --- a/examples/qmlscatter/main.cpp +++ b/examples/qmlscatter/main.cpp @@ -42,7 +42,7 @@ int main(int argc, char *argv[]) //! [0] viewer.setResizeMode(QQuickView::SizeRootObjectToView); //! [1] - viewer.showFullScreen(); + viewer.showMaximized(); //! [1] return app.exec(); diff --git a/examples/qmlscatter/qml/qmlscatter/main.qml b/examples/qmlscatter/qml/qmlscatter/main.qml index 8384625f..c8aebcc7 100644 --- a/examples/qmlscatter/qml/qmlscatter/main.qml +++ b/examples/qmlscatter/qml/qmlscatter/main.qml @@ -40,6 +40,7 @@ Item { id: dataView anchors.bottom: parent.bottom //! [9] + width: parent.width height: parent.height - shadowToggle.height //! [8] diff --git a/examples/qmlsurface/qml/qmlsurface/main.qml b/examples/qmlsurface/qml/qmlsurface/main.qml index 222879c6..f66e623b 100644 --- a/examples/qmlsurface/qml/qmlsurface/main.qml +++ b/examples/qmlsurface/qml/qmlsurface/main.qml @@ -54,7 +54,7 @@ Item { surfaceGridEnabled: false font.family: "STCaiyun" font.pointSize: 35 - cameraPreset: Surface3D.CameraPresetIsometricLeft + scene.activeCamera.cameraPreset: Surface3D.CameraPresetIsometricLeft dataProxy: surfaceData.heightProxy axisY.min: 0.0 axisY.max: 250.0 |
