From 26ef19061c608ad9e080fce0cc4e8143865a8d54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20N=C3=A4tterlund?= <tobias.naetterlund.qnx@kdab.com>
Date: Fri, 28 Sep 2012 14:34:41 +0200
Subject: [PATCH] QNX: Fixup bar-descriptor.xml files
- Qt 4 is included on the device for the BB10, add its path to LD_LIBRARY_PATH and QT_PLUGIN_PATH
- Make application ID depend on project name
Change-Id: I2dc67c0415395cb0a2c64fec1f1c43a96a3dde2c
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
---
.../wizards/bb-bardescriptor/bar-descriptor.xml | 9 ++-------
.../templates/wizards/bb-guiapp/bar-descriptor.xml | 11 +++--------
.../wizards/bb-qt5-guiapp/bar-descriptor.xml | 2 +-
.../wizards/bb-qt5-quick2app/bar-descriptor.xml | 2 +-
.../templates/wizards/bb-quickapp/bar-descriptor.xml | 11 +++--------
5 files changed, 10 insertions(+), 25 deletions(-)
diff --git a/share/qtcreator/templates/wizards/bb-bardescriptor/bar-descriptor.xml b/share/qtcreator/templates/wizards/bb-bardescriptor/bar-descriptor.xml
index b8fe696b5e9..c5cc31166bb 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 09fe868ef03..5727904396c 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 d1de8450190..e88f7c0d9b5 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 0acc8145a03..4e191478d23 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 f1059b31d5a..8f0a09e6115 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>
--
GitLab