diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-10-09 11:16:35 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2012-10-09 11:39:40 +0200 |
| commit | 2b56943a8e6efa4e60c14b11afc8d9fefcca13eb (patch) | |
| tree | 2d0bc991caebf27a7fc54628e63d5040019e7676 | |
| parent | 4f0b90dd43fb2b047b28b9020b5b8d252951726d (diff) | |
Change the default plugin provider to QtProject.
Change-Id: I4fbfeb3668d6688e4947cda514c1a56f7d01ca52
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| -rw-r--r-- | share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro | 2 | ||||
| -rw-r--r-- | src/plugins/QtcPlugin.qbs | 2 | ||||
| -rw-r--r-- | src/qtcreatorplugin.pri | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro index 8bf2f3358a..1f99486a71 100644 --- a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro +++ b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro @@ -34,4 +34,4 @@ PROVIDER = %VendorName% include($$QTCREATOR_SOURCES/src/qtcreatorplugin.pri) include($$QTCREATOR_SOURCES/src/plugins/coreplugin/coreplugin.pri) -LIBS += -L$$IDE_PLUGIN_PATH/Nokia +LIBS += -L$$IDE_PLUGIN_PATH/QtProject diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs index 606e798000..e1eaff2ca6 100644 --- a/src/plugins/QtcPlugin.qbs +++ b/src/plugins/QtcPlugin.qbs @@ -3,7 +3,7 @@ import qbs.fileinfo 1.0 as FileInfo Product { type: ["dynamiclibrary", "pluginSpec"] - property string provider: 'Nokia' + property string provider: 'QtProject' property var pluginspecreplacements destination: "lib/qtcreator/plugins/" + provider targetName: { diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri index 26ff57afd8..c760433b5a 100644 --- a/src/qtcreatorplugin.pri +++ b/src/qtcreatorplugin.pri @@ -4,9 +4,9 @@ include(../qtcreator.pri) isEmpty(PRECOMPILED_HEADER):PRECOMPILED_HEADER = $$PWD/shared/qtcreator_gui_pch.h isEmpty(PROVIDER) { - PROVIDER = Nokia + PROVIDER = QtProject } else { - LIBS += -L$$IDE_PLUGIN_PATH/Nokia + LIBS += -L$$IDE_PLUGIN_PATH/QtProject } isEmpty(USE_USER_DESTDIR) { @@ -24,7 +24,7 @@ isEmpty(USE_USER_DESTDIR) { DESTDIRBASE = "$$(XDG_DATA_HOME)" isEmpty(DESTDIRBASE):DESTDIRBASE = "$$(HOME)/.local/share/data" } - DESTDIR = "$$DESTDIRBASE/Nokia/$$DESTDIRAPPNAME/plugins/$$QTCREATOR_VERSION/$$PROVIDER" + DESTDIR = "$$DESTDIRBASE/QtProject/$$DESTDIRAPPNAME/plugins/$$QTCREATOR_VERSION/$$PROVIDER" } LIBS += -L$$DESTDIR |