diff --git a/share/qtcreator/templates/wizards/bb-qt5-bardescriptor/bar-descriptor.xml b/share/qtcreator/templates/wizards/bb-qt5-bardescriptor/bar-descriptor.xml index 1dc09ef123a04bcfc3e9dc636c70d07a96884bc7..a8c1c24488a78fcc71a4290d7a1971d22cae3328 100644 --- a/share/qtcreator/templates/wizards/bb-qt5-bardescriptor/bar-descriptor.xml +++ b/share/qtcreator/templates/wizards/bb-qt5-bardescriptor/bar-descriptor.xml @@ -14,7 +14,7 @@ <publisher>PUBLISHER</publisher> <copyright>COPYRIGHT</copyright> - <env var="QML_IMPORT_PATH" value="app/native/imports"/> + <env var="QML2_IMPORT_PATH" value="app/native/imports"/> <env var="QT_PLUGIN_PATH" value="app/native/plugins"/> <env var="LD_LIBRARY_PATH" value="app/native/lib"/> <arg>-style</arg> @@ -28,5 +28,5 @@ <!-- These values will be replaced when deploying in Qt Creator --> <asset path="%QT_INSTALL_LIBS%">lib</asset> <asset path="%QT_INSTALL_PLUGINS%">plugins</asset> - <asset path="%QT_INSTALL_IMPORTS%">imports</asset> + <asset path="%QT_INSTALL_QML%">imports</asset> </qnx> diff --git a/share/qtcreator/templates/wizards/bb-qt5-guiapp/bar-descriptor.xml b/share/qtcreator/templates/wizards/bb-qt5-guiapp/bar-descriptor.xml index 5d506c43728ee9ea7eff9baf94b328ed2e4a7036..2f23c63be61367fa895f003345ed041d886a3700 100644 --- a/share/qtcreator/templates/wizards/bb-qt5-guiapp/bar-descriptor.xml +++ b/share/qtcreator/templates/wizards/bb-qt5-guiapp/bar-descriptor.xml @@ -12,7 +12,7 @@ <aspectRatio>landscape</aspectRatio> </initialWindow> - <env var="QML_IMPORT_PATH" value="app/native/imports"/> + <env var="QML2_IMPORT_PATH" value="app/native/imports"/> <env var="QT_PLUGIN_PATH" value="app/native/plugins"/> <env var="LD_LIBRARY_PATH" value="app/native/lib"/> <publisher>PUBLISHER</publisher> @@ -27,5 +27,5 @@ <!-- These values will be replaced when deploying in Qt Creator --> <asset path="%QT_INSTALL_LIBS%">lib</asset> <asset path="%QT_INSTALL_PLUGINS%">plugins</asset> - <asset path="%QT_INSTALL_IMPORTS%">imports</asset> + <asset path="%QT_INSTALL_QML%">imports</asset> </qnx> diff --git a/share/qtcreator/templates/wizards/bb-qt5-quick2app/bar-descriptor.xml b/share/qtcreator/templates/wizards/bb-qt5-quick2app/bar-descriptor.xml index b5f957bd8a64e24f849f70ca57d66b0a89155c95..3a0bac8582082a905c97c5d26333dd594a0d0fbe 100644 --- a/share/qtcreator/templates/wizards/bb-qt5-quick2app/bar-descriptor.xml +++ b/share/qtcreator/templates/wizards/bb-qt5-quick2app/bar-descriptor.xml @@ -14,7 +14,7 @@ <publisher>PUBLISHER</publisher> <copyright>COPYRIGHT</copyright> - <env var="QML_IMPORT_PATH" value="app/native/imports"/> + <env var="QML2_IMPORT_PATH" value="app/native/imports"/> <env var="QT_PLUGIN_PATH" value="app/native/plugins"/> <env var="LD_LIBRARY_PATH" value="app/native/lib"/> @@ -29,5 +29,5 @@ <!-- These values will be replaced when deploying in Qt Creator --> <asset path="%QT_INSTALL_LIBS%">lib</asset> <asset path="%QT_INSTALL_PLUGINS%">plugins</asset> - <asset path="%QT_INSTALL_IMPORTS%">imports</asset> + <asset path="%QT_INSTALL_QML%">imports</asset> </qnx> diff --git a/src/plugins/qnx/blackberrycreatepackagestep.cpp b/src/plugins/qnx/blackberrycreatepackagestep.cpp index 7e1b48e96d86e14705fee23d1bd44c746f772a5a..9e7c74f0bddef16483654c20e35cbccfd90a7df9 100644 --- a/src/plugins/qnx/blackberrycreatepackagestep.cpp +++ b/src/plugins/qnx/blackberrycreatepackagestep.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2011 - 2013 Research In Motion +** Copyright (C) 2011 - 2012 Research In Motion ** ** Contact: Research In Motion (blackberry-qt@qnx.com) ** Contact: KDAB (info@kdab.com) @@ -62,6 +62,8 @@ const char QT_INSTALL_PLUGINS[] = "QT_INSTALL_PLUGINS"; const char QT_INSTALL_PLUGINS_VAR[] = "%QT_INSTALL_PLUGINS%"; const char QT_INSTALL_IMPORTS[] = "QT_INSTALL_IMPORTS"; const char QT_INSTALL_IMPORTS_VAR[] = "%QT_INSTALL_IMPORTS%"; +const char QT_INSTALL_QML[] = "QT_INSTALL_QML"; +const char QT_INSTALL_QML_VAR[] = "%QT_INSTALL_QML%"; const char SRC_DIR_VAR[] = "%SRC_DIR%"; } @@ -192,6 +194,8 @@ bool BlackBerryCreatePackageStep::prepareAppDescriptorFile(const QString &appDes fileContent.replace(QT_INSTALL_PLUGINS_VAR, qtVersion->versionInfo().value(QLatin1String(QT_INSTALL_PLUGINS)).toLatin1()); if (fileContent.contains(QT_INSTALL_IMPORTS_VAR)) fileContent.replace(QT_INSTALL_IMPORTS_VAR, qtVersion->versionInfo().value(QLatin1String(QT_INSTALL_IMPORTS)).toLatin1()); + if (fileContent.contains(QT_INSTALL_QML_VAR)) + fileContent.replace(QT_INSTALL_QML_VAR, qtVersion->versionInfo().value(QLatin1String(QT_INSTALL_QML)).toLatin1()); //Replace Source path placeholder if (fileContent.contains(SRC_DIR_VAR))