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

QNX: Fix QML_IMPORT_PATH setting in shipped bar-descriptor.xml files

Browse Source 
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>
This commit is contained in:
Tobias Nätterlund
2013-01-14 11:04:32 +01:00
committed by Nicolas Arnaud-Cormos
parent 522abb7362
commit e80c4b80fc
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@
</initialWindow> </initialWindow>
<publisher>PUBLISHER</publisher> <publisher>PUBLISHER</publisher>
<copyright>COPYRIGHT</copyright> <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="QT_PLUGIN_PATH" value="app/native/plugins:/usr/lib/qt4/plugins"/>
<env var="LD_LIBRARY_PATH" value="app/native/lib:/usr/lib/qt4/lib/"/> <env var="LD_LIBRARY_PATH" value="app/native/lib:/usr/lib/qt4/lib/"/>
<arg>-style</arg> <arg>-style</arg>

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

@@ -12,7 +12,7 @@
<aspectRatio>landscape</aspectRatio> <aspectRatio>landscape</aspectRatio>
</initialWindow> </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="QT_PLUGIN_PATH" value="app/native/plugins:/usr/lib/qt4/plugins"/>
<env var="LD_LIBRARY_PATH" value="app/native/lib:/usr/lib/qt4/lib/"/> <env var="LD_LIBRARY_PATH" value="app/native/lib:/usr/lib/qt4/lib/"/>

2
share/qtcreator/templates/wizards/bb-quickapp/bar-descriptor.xml
View File

@@ -12,7 +12,7 @@
<aspectRatio>landscape</aspectRatio> <aspectRatio>landscape</aspectRatio>
</initialWindow> </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="QT_PLUGIN_PATH" value="app/native/plugins:/usr/lib/qt4/plugins"/>
<env var="LD_LIBRARY_PATH" value="app/native/lib:/usr/lib/qt4/lib/"/> <env var="LD_LIBRARY_PATH" value="app/native/lib:/usr/lib/qt4/lib/"/>