diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-08-29 16:27:26 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-10-05 18:32:10 +0200 |
| commit | 2a4a56b2beec7a3c0be94302146461d2f730315d (patch) | |
| tree | 1c40b80c79d31869619678fc6260dfd5bf503e29 /share/qtcreator | |
| parent | c6a9de7252bf4f2a7592153caaabe13ebad8c4eb (diff) | |
| download | qt-creator-2a4a56b2beec7a3c0be94302146461d2f730315d.tar.gz | |
Load plugins from user config directory too.
Also adapt the Qt Creator plugin template to make it
possible to choose between deploying locally or into
Qt Creator's build directory.
Change-Id: Ia8566a5034443bc9574a1593eddf0a89eb4d80b2
Rubber-stamped-by: Daniel Molkentin
Reviewed-on: http://codereview.qt-project.org/4178
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'share/qtcreator')
| -rw-r--r-- | share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro | 8 | ||||
| -rw-r--r-- | share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml | 13 |
2 files changed, 21 insertions, 0 deletions
diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro index cdd9076242..d2128b3411 100644 --- a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro +++ b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro @@ -24,6 +24,14 @@ isEmpty(QTCREATOR_SOURCES):QTCREATOR_SOURCES=%QtCreatorSources% IDE_BUILD_TREE = $$(QTC_BUILD) isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=%QtCreatorBuild% +## uncomment to build plugin into user config directory +## <localappdata>/plugins/<ideversion> +## where <localappdata> is e.g. +## <drive>:\Users\<username>\AppData\Local\Nokia\QtCreator on Windows Vista and later +## $XDG_DATA_HOME/Nokia/QtCreator or ~/.local/share/Nokia/QtCreator on Linux +## ~/Library/Application Support/Nokia/QtCreator on Mac +%DestDir%USE_USER_DESTDIR = yes + PROVIDER = %VendorName% include($$QTCREATOR_SOURCES/src/qtcreatorplugin.pri) diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml b/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml index 05a6c3096b..9117ae8ad8 100644 --- a/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml +++ b/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml @@ -95,5 +95,18 @@ leave room for the Qt 4 target page. defaulttext="" /> <fielddescription>Qt Creator build:</fielddescription> </field> + <field name="DestDir"> + <fieldcontrol class="QComboBox" defaultindex="0"> + <comboentries> + <comboentry value="# "> + <comboentrytext>Qt Creator build</comboentrytext> + </comboentry> + <comboentry value=""> + <comboentrytext>Local user settings</comboentrytext> + </comboentry> + </comboentries> + </fieldcontrol> + <fielddescription>Deploy into:</fielddescription> + </field> </fields> </wizard> |