From e80c4b80fcc3bc3dacb8ed4c52f646bbf48121b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20N=C3=A4tterlund?= <tobias.naetterlund.qnx@kdab.com>
Date: Mon, 14 Jan 2013 11:04:32 +0100
Subject: [PATCH] QNX: Fix QML_IMPORT_PATH setting in shipped
 bar-descriptor.xml files

Include the path to /usr/lib/qt4/imports, to allow e.g. QtMultimediaKit
to be found, as it's installed there

Change-Id: I99815e82b8b25973d4347a0e95e1ecf7402b5d7b
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
---
 .../templates/wizards/bb-bardescriptor/bar-descriptor.xml       | 2 +-
 share/qtcreator/templates/wizards/bb-guiapp/bar-descriptor.xml  | 2 +-
 .../qtcreator/templates/wizards/bb-quickapp/bar-descriptor.xml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/qtcreator/templates/wizards/bb-bardescriptor/bar-descriptor.xml b/share/qtcreator/templates/wizards/bb-bardescriptor/bar-descriptor.xml
index f1a18771abc..cd534fe8b69 100644
--- a/share/qtcreator/templates/wizards/bb-bardescriptor/bar-descriptor.xml
+++ b/share/qtcreator/templates/wizards/bb-bardescriptor/bar-descriptor.xml
@@ -13,7 +13,7 @@
     </initialWindow>
     <publisher>PUBLISHER</publisher>
     <copyright>COPYRIGHT</copyright>
-    <env var="QML_IMPORT_PATH" value="app/native/imports"/>
+    <env var="QML_IMPORT_PATH" value="app/native/imports:/usr/lib/qt4/imports"/>
     <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>-style</arg>
diff --git a/share/qtcreator/templates/wizards/bb-guiapp/bar-descriptor.xml b/share/qtcreator/templates/wizards/bb-guiapp/bar-descriptor.xml
index 96071e6ba63..8ad05ef4562 100644
--- a/share/qtcreator/templates/wizards/bb-guiapp/bar-descriptor.xml
+++ b/share/qtcreator/templates/wizards/bb-guiapp/bar-descriptor.xml
@@ -12,7 +12,7 @@
         <aspectRatio>landscape</aspectRatio>
     </initialWindow>
 
-    <env var="QML_IMPORT_PATH" value="app/native/imports"/>
+    <env var="QML_IMPORT_PATH" value="app/native/imports:/usr/lib/qt4/imports"/>
     <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/"/>
 
diff --git a/share/qtcreator/templates/wizards/bb-quickapp/bar-descriptor.xml b/share/qtcreator/templates/wizards/bb-quickapp/bar-descriptor.xml
index eef7a876738..3bf0f233123 100644
--- a/share/qtcreator/templates/wizards/bb-quickapp/bar-descriptor.xml
+++ b/share/qtcreator/templates/wizards/bb-quickapp/bar-descriptor.xml
@@ -12,7 +12,7 @@
         <aspectRatio>landscape</aspectRatio>
     </initialWindow>
 
-    <env var="QML_IMPORT_PATH" value="app/native/imports"/>
+    <env var="QML_IMPORT_PATH" value="app/native/imports:/usr/lib/qt4/imports"/>
     <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/"/>