diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-14 08:12:34 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-14 08:12:34 +0300 |
| commit | 18a5a1510b90a16007569f436392b52553f150fa (patch) | |
| tree | 190f35b2da9ad298a4bc1636d0a9d993f41ea288 /examples/qmlscatter/main.cpp | |
| parent | a64c67d75badaa7662b8a05b8bc7ed78ec8e651e (diff) | |
| parent | 34c345b024be424873bbb8b3c83414eea2bc7523 (diff) | |
Merge remote-tracking branch 'origin/develop'
Change-Id: I3b63e58db8a5555ada270f81f88fa3b04cecada9
Diffstat (limited to 'examples/qmlscatter/main.cpp')
| -rw-r--r-- | examples/qmlscatter/main.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/examples/qmlscatter/main.cpp b/examples/qmlscatter/main.cpp index d48bea3d..cc3fa4c3 100644 --- a/examples/qmlscatter/main.cpp +++ b/examples/qmlscatter/main.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -** This file is part of the QtDataVis3D module. +** This file is part of the QtDataVisualization module. ** ** Licensees holding valid Qt Enterprise licenses may use this file in ** accordance with the Qt Enterprise License Agreement provided with the @@ -33,14 +33,15 @@ int main(int argc, char *argv[]) viewer.addImportPath(QString::fromLatin1("assets:/qml")); viewer.engine()->addPluginPath(QString::fromLatin1("%1/../%2").arg(QDir::homePath(), QString::fromLatin1("lib"))); -#else - viewer.addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), - QString::fromLatin1("qml"))); #endif + viewer.setTitle(QStringLiteral("QML scatter example")); + //! [0] viewer.setSource(QUrl("qrc:/qml/main.qml")); + //! [0] viewer.setResizeMode(QQuickView::SizeRootObjectToView); - viewer.setMinimumSize(QSize(640, 480)); - viewer.show(); + //! [1] + viewer.showMaximized(); + //! [1] return app.exec(); } |