diff options
| author | Patrick Burke <patrick.burke@nokia.com> | 2011-07-08 13:10:20 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-08 07:43:07 +0200 |
| commit | 302e1284b549e82323ef1932792ad5108f2f07a7 (patch) | |
| tree | 5680fc174f93dbaf8e13b6bb707afe8c11c32541 /demos | |
| parent | 11c2fefe779602fa6f09b5936a6dfb196b33ebe1 (diff) | |
Fixed building issues.
Qt5 checks in all qmlres.h files.
Removed duplicate += qtquick3d's in pro files.
Updated manual test to use DeclarativeView3D's.
Updated the qmlres.h files for demos/tutorials/tests to point to the
resources/examples directory where all the qml files are stored,
rather then resources/demos, resouces/tutorials, resources/tests, which
don't exist.
Change-Id: I5e8c99e22cf1bf6aace8fd595e42c8beb736d823
Reviewed-on: http://codereview.qt.nokia.com/1338
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/quick3d/qmlres.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/demos/quick3d/qmlres.h b/demos/quick3d/qmlres.h index e80fa38b5..9c61eee90 100644 --- a/demos/quick3d/qmlres.h +++ b/demos/quick3d/qmlres.h @@ -59,7 +59,11 @@ static QString q_get_qmldir(const QString &name) { QString qml = name; // try for a Linux package install first - QDir pkgdir(QLatin1String("/usr/share/qt4/quick3d/demos")); +#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) + QDir pkgdir(QLatin1String("/usr/share/qt5/quick3d/examples")); +#else + QDir pkgdir(QLatin1String("/usr/share/qt4/quick3d/examples")); +#endif QString app = QCoreApplication::applicationFilePath(); app = app.section(QDir::separator(), -1); if (pkgdir.cd(app) && pkgdir.exists()) @@ -99,13 +103,13 @@ static QString q_get_qmldir(const QString &name) //Grab just the app name itself. app = app.section(QDir::separator(), -1); - if (dir.cd(QLatin1String("demos")) && dir.cd(app) && dir.exists()) + if (dir.cd(QLatin1String("examples")) && dir.cd(app) && dir.exists()) { qml = dir.filePath(qml); } else { - QString msg = QLatin1String("demos"); + QString msg = QLatin1String("examples"); msg += QDir::separator(); msg += app; qWarning("Expected %s directry with qml resources!", qPrintable(msg)); |