Commit c00ee670 authored by Kai Koehne's avatar Kai Koehne Committed by Eike Ziller

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/4275Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@nokia.com>
parent ad22dc76
......@@ -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())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment