From 53fb29bddab0e57f933a5438dddacbf740e4e636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20N=C3=A4tterlund?= Date: Fri, 19 Apr 2013 13:50:17 +0200 Subject: [PATCH] QtQuick2ApplicationViewer: properly resolve install paths This is a port of commit 2982545d to also apply it to the qtquick2applicationviewer.cpp template. Change-Id: Ia9d964d9fc98ea957c52aea783c6148449552755 Reviewed-by: Christian Kandeler Reviewed-by: Eike Ziller --- .../qtquick2applicationviewer.cpp | 8 ++++++-- src/plugins/qt4projectmanager/wizards/qtquickapp.cpp | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/share/qtcreator/templates/qtquick2app/qtquick2applicationviewer/qtquick2applicationviewer.cpp b/share/qtcreator/templates/qtquick2app/qtquick2applicationviewer/qtquick2applicationviewer.cpp index 3b19047fb2a..6d7232e2609 100644 --- a/share/qtcreator/templates/qtquick2app/qtquick2applicationviewer/qtquick2applicationviewer.cpp +++ b/share/qtcreator/templates/qtquick2app/qtquick2applicationviewer/qtquick2applicationviewer.cpp @@ -29,11 +29,15 @@ QString QtQuick2ApplicationViewerPrivate::adjustPath(const QString &path) #elif defined(Q_OS_QNX) if (!QDir::isAbsolutePath(path)) return QString::fromLatin1("app/native/%1").arg(path); -#elif defined(Q_OS_UNIX) && !defined(Q_OS_ANDROID) - const QString pathInInstallDir = +#elif !defined(Q_OS_ANDROID) + QString pathInInstallDir = QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path); if (QFileInfo(pathInInstallDir).exists()) return pathInInstallDir; + pathInInstallDir = + QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path); + if (QFileInfo(pathInInstallDir).exists()) + return pathInInstallDir; #endif return path; } diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp index ec50c9fbaff..7ebf816afba 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp @@ -227,7 +227,7 @@ QByteArray QtQuickApp::generateFileExtended(int fileType, int QtQuickApp::stubVersionMinor() const { - return m_componentSet == QtQuick20Components ? 3 : 23; + return m_componentSet == QtQuick20Components ? 4 : 23; } QList QtQuickApp::updateableFiles(const QString &mainProFile) const