diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2011-09-06 16:57:11 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-09-12 10:22:06 +0200 |
| commit | c00ee6701b0a1b1366c24e7ec8c907d4a623e3f5 (patch) | |
| tree | 5cedafab27639991dc813695b4ad84cdd92044b9 | |
| parent | ad22dc767ce6a01532f11be4e3cf5dee773db405 (diff) | |
| download | qt-creator-c00ee6701b0a1b1366c24e7ec8c907d4a623e3f5.tar.gz | |
QtQuickApp: Use QCoreApplication::applicationDirPath also for Harmattan
Latest Harmattan sources deprecate MDeclarativeCache::applicationDirPath
http://meego.gitorious.org/meegotouch/meegotouch-applauncherd/commit/1c93b10b0aa6fa528d1a49e029a7158b4e2cea8d/diffs
Change-Id: I4342c567265d192a580d572c6bec8d28ab363120
Reviewed-on: http://codereview.qt-project.org/4275
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
| -rw-r--r-- | share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp index c7ccf089be..3ef65126d1 100644 --- a/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -66,11 +66,7 @@ QString QmlApplicationViewerPrivate::adjustPath(const QString &path) + QLatin1String("/../Resources/") + path; #else QString pathInInstallDir; -#ifdef HARMATTAN_BOOSTER - QString applicationDirPath = MDeclarativeCache::applicationDirPath(); -#else - QString applicationDirPath = QCoreApplication::applicationDirPath(); -#endif + const QString applicationDirPath = QCoreApplication::applicationDirPath(); pathInInstallDir = QString::fromAscii("%1/../%2").arg(applicationDirPath, path); if (QFileInfo(pathInInstallDir).exists()) |