feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QtQuickApp: Use QCoreApplication::applicationDirPath also for Harmattan

Browse Source 
Latest Harmattan sources deprecate MDeclarativeCache::applicationDirPath

1c93b10b0a/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>
This commit is contained in:
Kai Koehne
2011-09-06 16:57:11 +02:00
committed by Eike Ziller
parent ad22dc767c
commit c00ee6701b
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
View File

@@ -66,11 +66,7 @@ QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
+ QLatin1String("/../Resources/") + path; + QLatin1String("/../Resources/") + path;
#else #else
QString pathInInstallDir; QString pathInInstallDir;
#ifdef HARMATTAN_BOOSTER const QString applicationDirPath = QCoreApplication::applicationDirPath();
QString applicationDirPath = MDeclarativeCache::applicationDirPath();
#else
QString applicationDirPath = QCoreApplication::applicationDirPath();
#endif
pathInInstallDir = QString::fromAscii("%1/../%2").arg(applicationDirPath, path); pathInInstallDir = QString::fromAscii("%1/../%2").arg(applicationDirPath, path);
if (QFileInfo(pathInInstallDir).exists()) if (QFileInfo(pathInInstallDir).exists())