diff --git a/share/qtcreator/templates/wizards/bb-bardescriptor/bar-descriptor.xml b/share/qtcreator/templates/wizards/bb-bardescriptor/bar-descriptor.xml index b8fe696b5e918f402464711e03c4dd8eb8ff6bf8..c5cc31166bb3087d436d30f98703a7b8f0ffcd78 100644 --- a/share/qtcreator/templates/wizards/bb-bardescriptor/bar-descriptor.xml +++ b/share/qtcreator/templates/wizards/bb-bardescriptor/bar-descriptor.xml @@ -14,8 +14,8 @@ <publisher>PUBLISHER</publisher> <copyright>COPYRIGHT</copyright> <env var="QML_IMPORT_PATH" value="app/native/imports"/> - <env var="QT_PLUGIN_PATH" value="app/native/plugins"/> - <env var="LD_LIBRARY_PATH" value="app/native/lib"/> + <env var="QT_PLUGIN_PATH" value="app/native/plugins:/usr/lib/qt4/plugins"/> + <env var="LD_LIBRARY_PATH" value="app/native/lib:/usr/lib/qt4/lib/"/> <arg>-platform</arg> <arg>blackberry</arg> <arg>-style</arg> @@ -25,9 +25,4 @@ <!-- PROJECTPATH should point to the project binary, path can be relative --> <asset entry="true" path="PROJECTPATH" type="Qnx/Elf">PROJECTNAME</asset> - - <!-- 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> </qnx> diff --git a/share/qtcreator/templates/wizards/bb-guiapp/bar-descriptor.xml b/share/qtcreator/templates/wizards/bb-guiapp/bar-descriptor.xml index 09fe868ef038918ff2b028be5113d540ff8fb3bc..5727904396c4cd31884740631b1ca54bc3c9d8e2 100644 --- a/share/qtcreator/templates/wizards/bb-guiapp/bar-descriptor.xml +++ b/share/qtcreator/templates/wizards/bb-guiapp/bar-descriptor.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="no"?> <qnx xmlns="http://www.qnx.com/schemas/application/1.0"> - <id>ID</id> + <id>com.example.%ProjectName%</id> <name>%ProjectName%</name> <versionNumber>1.0.0</versionNumber> <description>DESCRIPTION</description> @@ -13,16 +13,11 @@ </initialWindow> <env var="QML_IMPORT_PATH" value="app/native/imports"/> - <env var="QT_PLUGIN_PATH" value="app/native/plugins"/> - <env var="LD_LIBRARY_PATH" value="app/native/lib"/> + <env var="QT_PLUGIN_PATH" value="app/native/plugins:/usr/lib/qt4/plugins"/> + <env var="LD_LIBRARY_PATH" value="app/native/lib:/usr/lib/qt4/lib/"/> <arg>-platform</arg> <arg>blackberry</arg> <action system="true">run_native</action> <asset entry="true" path="%ProjectName%" type="Qnx/Elf">%ProjectName%</asset> - - <!-- 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> </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 d1de8450190229fa9475af327bddbfd70380f79f..e88f7c0d9b5872c0fa50760ce895574a01019084 100644 --- a/share/qtcreator/templates/wizards/bb-qt5-guiapp/bar-descriptor.xml +++ b/share/qtcreator/templates/wizards/bb-qt5-guiapp/bar-descriptor.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="no"?> <qnx xmlns="http://www.qnx.com/schemas/application/1.0"> - <id>ID</id> + <id>com.example.%ProjectName%</id> <name>%ProjectName%</name> <versionNumber>1.0.0</versionNumber> <description>DESCRIPTION</description> 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 0acc8145a03e32becea479f16e78b8058a0ad334..4e191478d23a1dc82b7904a7de2fc24dfbf93a7b 100644 --- a/share/qtcreator/templates/wizards/bb-qt5-quick2app/bar-descriptor.xml +++ b/share/qtcreator/templates/wizards/bb-qt5-quick2app/bar-descriptor.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="no"?> <qnx xmlns="http://www.qnx.com/schemas/application/1.0"> - <id>ID</id> + <id>com.example.%ProjectName%</id> <name>%ProjectName%</name> <versionNumber>1.0.0</versionNumber> <description>DESCRIPTION</description> diff --git a/share/qtcreator/templates/wizards/bb-quickapp/bar-descriptor.xml b/share/qtcreator/templates/wizards/bb-quickapp/bar-descriptor.xml index f1059b31d5ae6a6b913da08b39436c8331459ea3..8f0a09e61159d93b6d8508b1bd542f8872d98e25 100644 --- a/share/qtcreator/templates/wizards/bb-quickapp/bar-descriptor.xml +++ b/share/qtcreator/templates/wizards/bb-quickapp/bar-descriptor.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="no"?> <qnx xmlns="http://www.qnx.com/schemas/application/1.0"> - <id>ID</id> + <id>com.example.%ProjectName%</id> <name>%ProjectName%</name> <versionNumber>1.0.0</versionNumber> <description>DESCRIPTION</description> @@ -13,8 +13,8 @@ </initialWindow> <env var="QML_IMPORT_PATH" value="app/native/imports"/> - <env var="QT_PLUGIN_PATH" value="app/native/plugins"/> - <env var="LD_LIBRARY_PATH" value="app/native/lib"/> + <env var="QT_PLUGIN_PATH" value="app/native/plugins:/usr/lib/qt4/plugins"/> + <env var="LD_LIBRARY_PATH" value="app/native/lib:/usr/lib/qt4/lib/"/> <arg>-platform</arg> <arg>blackberry</arg> @@ -22,9 +22,4 @@ <asset entry="true" path="%ProjectName%" type="Qnx/Elf">%ProjectName%</asset> <asset path="%SRC_DIR%/qml">qml</asset> - - <!-- 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> </qnx>