feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qnx: polishing bar-descriptor.xml files in Qt5 wizard templates

Browse Source 
Change-Id: Ib943bdbfd6ebc7c9dfcbe5fd4995df86a3b73ff7
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
This commit is contained in:
David Kaspar
2013-09-09 17:08:07 +02:00
parent 87a3aac18f
commit 3c94b88cef
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
share/qtcreator/templates/wizards/bb-qt5-bardescriptor/bar-descriptor.xml
View File

@@ -4,6 +4,8 @@
<name>PROJECTNAME</name>
<versionNumber>1.0.0</versionNumber>
<description>DESCRIPTION</description>
<publisher>PUBLISHER</publisher>
<copyright>COPYRIGHT</copyright>
<initialWindow>
<systemChrome>none</systemChrome>
@@ -11,8 +13,6 @@
<autoOrients>true</autoOrients>
<aspectRatio>landscape</aspectRatio>
</initialWindow>
<publisher>PUBLISHER</publisher>
<copyright>COPYRIGHT</copyright>
<env var="QML2_IMPORT_PATH" value="app/native/imports"/>
<env var="QT_PLUGIN_PATH" value="app/native/plugins"/>
@@ -23,11 +23,20 @@
<action system="true">run_native</action>
<!-- 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 -->
<!--
%QT_INSTALL_LIBS%, %QT_INSTALL_PLUGINS, %QT_INSTALL_QML% and %SRC_DIR%
tags are replaced on-the-fly when deploying the app. in Qt Creator.
-->
<asset path="%QT_INSTALL_LIBS%">lib</asset>
<asset path="%QT_INSTALL_PLUGINS%">plugins</asset>
<asset path="%QT_INSTALL_QML%">imports</asset>
<!--
By default this bar-descriptor.xml embeds Qt5 runtime
into the application itself. See the following document
for various deployments of Qt runtime to a device:
http://qt-project.org/wiki/Qt-on-BlackBerry-devices
-->
</qnx>

17
share/qtcreator/templates/wizards/bb-qt5-guiapp/bar-descriptor.xml
View File

@@ -4,6 +4,8 @@
<name>%ProjectName%</name>
<versionNumber>1.0.0</versionNumber>
<description>DESCRIPTION</description>
<publisher>PUBLISHER</publisher>
<copyright>COPYRIGHT</copyright>
<initialWindow>
<systemChrome>none</systemChrome>
@@ -15,17 +17,26 @@
<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>
<copyright>COPYRIGHT</copyright>
<arg>-platform</arg>
<arg>qnx</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 -->
<!--
%QT_INSTALL_LIBS%, %QT_INSTALL_PLUGINS, %QT_INSTALL_QML% and %SRC_DIR%
tags are replaced on-the-fly when deploying the app. in Qt Creator.
-->
<asset path="%QT_INSTALL_LIBS%">lib</asset>
<asset path="%QT_INSTALL_PLUGINS%">plugins</asset>
<asset path="%QT_INSTALL_QML%">imports</asset>
<!--
By default this bar-descriptor.xml embeds Qt5 runtime
into the application itself. See the following document
for various deployments of Qt runtime to a device:
http://qt-project.org/wiki/Qt-on-BlackBerry-devices
-->
</qnx>