diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-11-30 21:23:54 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-11 19:54:59 +0100 |
| commit | fa069c0140a466c2312bffb3210521d31213739d (patch) | |
| tree | 2af6f02fda100d52fdafbd793c92a6132d1f7ed2 | |
| parent | 39331f5611e5e229ce15243020a406e45f5d814a (diff) | |
| download | qt-creator-fa069c0140a466c2312bffb3210521d31213739d.tar.gz | |
VcProjectManager: Fix Qt5 registration
Change-Id: Id681c36b678ebfabfa1e055a2839256ac3cab8ee
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
3 files changed, 15 insertions, 7 deletions
diff --git a/src/plugins/vcprojectmanager/VcProjectManager.pluginspec.in b/src/plugins/vcprojectmanager/VcProjectManager.pluginspec.in index 7bf9bfb1e5..ded74b31a2 100644 --- a/src/plugins/vcprojectmanager/VcProjectManager.pluginspec.in +++ b/src/plugins/vcprojectmanager/VcProjectManager.pluginspec.in @@ -1,10 +1,18 @@ -<plugin name=\"VcProjectManager\" version=\"0.0.1\" compatVersion=\"0.0.1\"> +<plugin name=\"VcProjectManager\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\"> <vendor>BojanPetrovic</vendor> - <copyright>(C) Bojan Petrovic</copyright> - <license>Public domain</license> - <description>Opens .vcproj</description> - <url>http://www.mycompany.com</url> + <copyright>(C) 2014 Bojan Petrovic, (C) 2014 Radovan Zivkovic</copyright> + <license> +Commercial Usage + +Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia. + +GNU Lesser General Public License Usage + +Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + </license> <category>Build Systems</category> + <description>Opens .vcproj</description> + <url>http://www.qt-project.org</url> $$dependencyList </plugin> diff --git a/src/plugins/vcprojectmanager/vcprojectmanagerplugin.cpp b/src/plugins/vcprojectmanager/vcprojectmanagerplugin.cpp index 81e1d2d8e1..5c0bbc615e 100644 --- a/src/plugins/vcprojectmanager/vcprojectmanagerplugin.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmanagerplugin.cpp @@ -115,5 +115,4 @@ ExtensionSystem::IPlugin::ShutdownFlag VcProjectManagerPlugin::aboutToShutdown() } // namespace Internal } // namespace VcProjectManager -Q_EXPORT_PLUGIN2(VcProjectManager, VcProjectManager::Internal::VcProjectManagerPlugin) - +Q_EXPORT_PLUGIN(VcProjectManager) diff --git a/src/plugins/vcprojectmanager/vcprojectmanagerplugin.h b/src/plugins/vcprojectmanager/vcprojectmanagerplugin.h index 4855539d31..bbb7b2f235 100644 --- a/src/plugins/vcprojectmanager/vcprojectmanagerplugin.h +++ b/src/plugins/vcprojectmanager/vcprojectmanagerplugin.h @@ -40,6 +40,7 @@ namespace Internal { class VcProjectManagerPlugin : public ExtensionSystem::IPlugin { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "VcProjectManager.json") public: VcProjectManagerPlugin(); |