diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-10-11 12:02:49 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-10-11 12:19:00 +0300 |
| commit | df0d23de333ad5d040a467cdcbe7da18b2cea635 (patch) | |
| tree | 37f8139b725ec55f1d66b79b7a3e714b519960ff | |
| parent | f00046bf71227ddc1332e54951bb8ed0ac1a4d1a (diff) | |
Fix c++ mains of qml examples
Change-Id: Ided1a50bd740c339cfb5406ac0e911ea9de52e84
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| -rw-r--r-- | examples/qmlbars/main.cpp | 5 | ||||
| -rw-r--r-- | examples/qmlscatter/main.cpp | 4 | ||||
| -rw-r--r-- | examples/qmlsurface/main.cpp | 3 |
3 files changed, 3 insertions, 9 deletions
diff --git a/examples/qmlbars/main.cpp b/examples/qmlbars/main.cpp index 1a3fcddc..58cd5e32 100644 --- a/examples/qmlbars/main.cpp +++ b/examples/qmlbars/main.cpp @@ -33,10 +33,9 @@ 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("Monthly income/expenses")); + viewer.setSource(QUrl("qrc:/qml/main.qml")); viewer.setResizeMode(QQuickView::SizeRootObjectToView); viewer.show(); diff --git a/examples/qmlscatter/main.cpp b/examples/qmlscatter/main.cpp index e04ceab5..cc3fa4c3 100644 --- a/examples/qmlscatter/main.cpp +++ b/examples/qmlscatter/main.cpp @@ -33,10 +33,8 @@ 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] diff --git a/examples/qmlsurface/main.cpp b/examples/qmlsurface/main.cpp index 2c953fe7..6b859158 100644 --- a/examples/qmlsurface/main.cpp +++ b/examples/qmlsurface/main.cpp @@ -33,9 +33,6 @@ 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("Tycho crater on the Moon (height exaggerated)")); viewer.setSource(QUrl("qrc:/qml/main.qml")); |