From 874328fe9bf68b18ee2dd0e1e6aa7c7d497d00e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20N=C3=A4tterlund?= Date: Fri, 19 Apr 2013 13:54:52 +0200 Subject: [PATCH] QNX: Corrected path to qml files for pure QNX devices For pure QNX (non-BlackBerry) devices, the path to the QML files are decided by the user. Only adjust the path for BlackBerry devices. Change-Id: I909ed0a06bc6985a5a353aab61bda395afcfb7aa Reviewed-by: Eike Ziller Reviewed-by: Mehdi Fekari --- .../qtquick2applicationviewer/qtquick2applicationviewer.cpp | 2 +- .../qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp | 2 +- src/plugins/qt4projectmanager/wizards/qtquickapp.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/share/qtcreator/templates/qtquick2app/qtquick2applicationviewer/qtquick2applicationviewer.cpp b/share/qtcreator/templates/qtquick2app/qtquick2applicationviewer/qtquick2applicationviewer.cpp index 6d7232e260..7f5e1e40d7 100644 --- a/share/qtcreator/templates/qtquick2app/qtquick2applicationviewer/qtquick2applicationviewer.cpp +++ b/share/qtcreator/templates/qtquick2app/qtquick2applicationviewer/qtquick2applicationviewer.cpp @@ -26,7 +26,7 @@ QString QtQuick2ApplicationViewerPrivate::adjustPath(const QString &path) if (!QDir::isAbsolutePath(path)) return QString::fromLatin1("%1/../Resources/%2") .arg(QCoreApplication::applicationDirPath(), path); -#elif defined(Q_OS_QNX) +#elif defined(Q_OS_BLACKBERRY) if (!QDir::isAbsolutePath(path)) return QString::fromLatin1("app/native/%1").arg(path); #elif !defined(Q_OS_ANDROID) diff --git a/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp index 9166a92f80..f373ad6f53 100644 --- a/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -60,7 +60,7 @@ QString QmlApplicationViewerPrivate::adjustPath(const QString &path) if (!QDir::isAbsolutePath(path)) return QString::fromLatin1("%1/../Resources/%2") .arg(QCoreApplication::applicationDirPath(), path); -#elif defined(Q_OS_QNX) +#elif defined(Q_OS_BLACKBERRY) if (!QDir::isAbsolutePath(path)) return QString::fromLatin1("app/native/%1").arg(path); #elif !defined(Q_OS_ANDROID) diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp index 7ebf816afb..99754a14ad 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 ? 4 : 23; + return m_componentSet == QtQuick20Components ? 5 : 24; } QList QtQuickApp::updateableFiles(const QString &mainProFile) const -- GitLab