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 <eike.ziller@digia.com>
Reviewed-by: Mehdi Fekari <mfekari@rim.com>

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)

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)

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<AbstractGeneratedFileInfo> QtQuickApp::updateableFiles(const QString &mainProFile) const