diff options
| author | Patrick Burke <patrick.burke@nokia.com> | 2011-07-21 14:01:18 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-21 06:04:46 +0200 |
| commit | d581f80308cda6bd59048743de6ea0e3ccebfb0a (patch) | |
| tree | e51923a25b16947131dbf753df8f72d58ce3bb23 /demos | |
| parent | 5dc3cbddb77e7a9eacabf40c00b83c944108bcc9 (diff) | |
More deployment updates.
Change-Id: I471f5f8c6301a1d694060a76108894d1a4aea922
Reviewed-on: http://codereview.qt.nokia.com/1912
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/quick3d/qmlres.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/demos/quick3d/qmlres.h b/demos/quick3d/qmlres.h index e13ebfe28..f54fe1703 100644 --- a/demos/quick3d/qmlres.h +++ b/demos/quick3d/qmlres.h @@ -48,6 +48,9 @@ #include <QtCore/qdebug.h> +#define internal_xstr(s) internal_str(s) +#define internal_str(s) #s + /*! \internal Returns a string with the path to qml resources, including qml sources, @@ -61,7 +64,7 @@ static QString q_get_qmldir(const QString &name) // try for a Linux package install first #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) #ifdef QT3D_USE_OPT - QDir pkgdir(QLatin1String("/opt/mt/applications/" QT3D_USE_OPT)); + QDir pkgdir(QLatin1String("/opt/mt/applications/" internal_xstr(QT3D_USE_OPT))); #else QDir pkgdir(QLatin1String("/usr/share/qt5/quick3d/examples")); #endif |