diff options
| author | El Mehdi Fekari <mfekari@blackberry.com> | 2014-04-04 12:14:26 +0200 |
|---|---|---|
| committer | Mehdi Fekari <mfekari@blackberry.com> | 2014-05-02 12:05:55 +0200 |
| commit | 7a45450831c9fdd182c0f6b8c4522a601502aabc (patch) | |
| tree | 05cc8d3689d9c3cdd5933a234a588b88de8ad601 /share | |
| parent | 4b2cc015f867941a7ae35a38d81ec9daa5616711 (diff) | |
Qnx: Properly setup the environment vars in the bar descriptor
The environment variables in the bar descriptor are modified
depending on the Qt deployment option the user selects.
This causes inconsistent behavior if the user modifies those values
on the template file. The env var values will be generated
in the final bar descriptor without being visible on the template
to avoid any user modifications that won't apply correclty.
Note: For next releases, the bar descriptor needs to be handled
properly to avoid any black magic so all modifications should
be visible to the user.
Task-number: QTCREATORBUG-11916
Change-Id: I00a2c855be3def31cd008071c6269e5a69f81536
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/templates/wizards/bb-qt5-bardescriptor/bar-descriptor.xml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/share/qtcreator/templates/wizards/bb-qt5-bardescriptor/bar-descriptor.xml b/share/qtcreator/templates/wizards/bb-qt5-bardescriptor/bar-descriptor.xml index f7c610811d..67b4d2bd95 100644 --- a/share/qtcreator/templates/wizards/bb-qt5-bardescriptor/bar-descriptor.xml +++ b/share/qtcreator/templates/wizards/bb-qt5-bardescriptor/bar-descriptor.xml @@ -14,10 +14,6 @@ <aspectRatio>landscape</aspectRatio> </initialWindow> - <env var="QML2_IMPORT_PATH" value="app/native/runtime/qt/qml:/accounts/devuser/qt/qml:$QML2_IMPORT_PATH"/> - <env var="QT_PLUGIN_PATH" value="app/native/runtime/qt/plugins:/accounts/devuser/qt/plugins:$QT_PLUGIN_PATH"/> - <env var="LD_LIBRARY_PATH" value="app/native/runtime/qt/lib:/accounts/devuser/qt/lib:$LD_LIBRARY_PATH"/> - <action system="true">run_native</action> <asset entry="true" path="PROJECTPATH" type="Qnx/Elf">PROJECTNAME</asset> |