diff options
| author | Julian de Bhal <julian.debhal@nokia.com> | 2012-02-14 11:45:21 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-17 02:46:02 +0100 |
| commit | 9f91abb3abde6161119470507e4745423d7f65b2 (patch) | |
| tree | a0bb4913d222b3f9f3e8039efb9062ae8709a55d /demos | |
| parent | 770221c93cf5cf313d41a1b102dde695247a9d3d (diff) | |
Fix demos version of qmlres.h to refer to demos
Change-Id: Ib48ad8886b19ed8af4fea9d0b88f7815ece1df20
Reviewed-by: Danny Pope <daniel.pope@nokia.com>
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/quick3d/flickr3d/main.cpp | 2 | ||||
| -rw-r--r-- | demos/quick3d/model_viewer/main.cpp | 2 | ||||
| -rw-r--r-- | demos/quick3d/qmlres.h | 10 | ||||
| -rw-r--r-- | demos/quick3d/robo_bounce/main.cpp | 2 | ||||
| -rw-r--r-- | demos/quick3d/tea_service/main.cpp | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/demos/quick3d/flickr3d/main.cpp b/demos/quick3d/flickr3d/main.cpp index a49afa7e9..85fb4e0e7 100644 --- a/demos/quick3d/flickr3d/main.cpp +++ b/demos/quick3d/flickr3d/main.cpp @@ -41,4 +41,4 @@ #include "../qmlres.h" -QUICK3D_EXAMPLE_MAIN("qml/desktop.qml") +QUICK3D_MAIN("qml/desktop.qml") diff --git a/demos/quick3d/model_viewer/main.cpp b/demos/quick3d/model_viewer/main.cpp index a49afa7e9..85fb4e0e7 100644 --- a/demos/quick3d/model_viewer/main.cpp +++ b/demos/quick3d/model_viewer/main.cpp @@ -41,4 +41,4 @@ #include "../qmlres.h" -QUICK3D_EXAMPLE_MAIN("qml/desktop.qml") +QUICK3D_MAIN("qml/desktop.qml") diff --git a/demos/quick3d/qmlres.h b/demos/quick3d/qmlres.h index 67ee3d4c8..f7f5053cb 100644 --- a/demos/quick3d/qmlres.h +++ b/demos/quick3d/qmlres.h @@ -66,10 +66,10 @@ static QString q_get_qmldir(const QString &name) #ifdef QT3D_USE_OPT QDir pkgdir(QLatin1String("/opt/mt/applications/" internal_xstr(QT3D_USE_OPT))); #else - QDir pkgdir(QLatin1String("/usr/share/qt5/quick3d/examples")); + QDir pkgdir(QLatin1String("/usr/share/qt5/quick3d/demos")); #endif #else - QDir pkgdir(QLatin1String("/usr/share/qt4/quick3d/examples")); + QDir pkgdir(QLatin1String("/usr/share/qt4/quick3d/demos")); #endif QString app = QCoreApplication::applicationFilePath(); app = app.section(QDir::separator(), -1); @@ -110,13 +110,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("examples")) && dir.cd(app) && dir.exists()) + if (dir.cd(QLatin1String("demos")) && dir.cd(app) && dir.exists()) { qml = dir.filePath(qml); } else { - QString msg = QLatin1String("examples"); + QString msg = QLatin1String("demos"); msg += QDir::separator(); msg += app; qWarning("Expected %s directry with qml resources!", qPrintable(msg)); @@ -127,7 +127,7 @@ static QString q_get_qmldir(const QString &name) return qml; } -#define QUICK3D_EXAMPLE_MAIN(file) \ +#define QUICK3D_MAIN(file) \ int main(int argc, char *argv[]) \ { \ QGuiApplication app(argc, argv); \ diff --git a/demos/quick3d/robo_bounce/main.cpp b/demos/quick3d/robo_bounce/main.cpp index a49afa7e9..85fb4e0e7 100644 --- a/demos/quick3d/robo_bounce/main.cpp +++ b/demos/quick3d/robo_bounce/main.cpp @@ -41,4 +41,4 @@ #include "../qmlres.h" -QUICK3D_EXAMPLE_MAIN("qml/desktop.qml") +QUICK3D_MAIN("qml/desktop.qml") diff --git a/demos/quick3d/tea_service/main.cpp b/demos/quick3d/tea_service/main.cpp index a49afa7e9..85fb4e0e7 100644 --- a/demos/quick3d/tea_service/main.cpp +++ b/demos/quick3d/tea_service/main.cpp @@ -41,4 +41,4 @@ #include "../qmlres.h" -QUICK3D_EXAMPLE_MAIN("qml/desktop.qml") +QUICK3D_MAIN("qml/desktop.qml") |