diff options
| author | Tobias Nätterlund <tobias.naetterlund.qnx@kdab.com> | 2013-01-14 11:04:32 +0100 |
|---|---|---|
| committer | Nicolas Arnaud-Cormos <nicolas@kdab.com> | 2013-01-21 08:10:41 +0100 |
| commit | e80c4b80fcc3bc3dacb8ed4c52f646bbf48121b2 (patch) | |
| tree | 13bc5cae2ed6170b8d043af3958eae9948354ef1 | |
| parent | 522abb736244766a244b036befa98d8884f2647d (diff) | |
| download | qt-creator-e80c4b80fcc3bc3dacb8ed4c52f646bbf48121b2.tar.gz | |
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>
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 f1a18771ab..cd534fe8b6 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 96071e6ba6..8ad05ef456 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 eef7a87673..3bf0f23312 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/"/> |