aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/updateinfo
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2014-08-26 17:29:38 +0200
committerEike Ziller <eike.ziller@digia.com>2014-09-02 15:11:24 +0200
commitb5b6a46b4e17dde56ac4409bd6551eaaf297b375 (patch)
tree216df467b3df092bad019656329d299b44e51ee1 /src/plugins/updateinfo
parent8dc9d67e898ecb9afa239fcba914ed178931901b (diff)
ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec files
Change-Id: I2b2c704260c613985a4bda179658ec1f8879e70f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/plugins/updateinfo')
-rw-r--r--src/plugins/updateinfo/UpdateInfo.json.in20
-rw-r--r--src/plugins/updateinfo/UpdateInfo.pluginspec.in17
-rw-r--r--src/plugins/updateinfo/updateinfo.qbs2
3 files changed, 21 insertions, 18 deletions
diff --git a/src/plugins/updateinfo/UpdateInfo.json.in b/src/plugins/updateinfo/UpdateInfo.json.in
new file mode 100644
index 0000000000..b382c7612b
--- /dev/null
+++ b/src/plugins/updateinfo/UpdateInfo.json.in
@@ -0,0 +1,20 @@
+{
+ \"Name\" : \"UpdateInfo\",
+ \"Version\" : \"$$QTCREATOR_VERSION\",
+ \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\",
+ \"Experimental\" : $$UPDATEINFO_EXPERIMENTAL_STR,
+ \"Vendor\" : \"Digia Plc\",
+ \"Copyright\" : \"(C) 2014 Digia Plc\",
+ \"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.\"
+ ],
+ \"Category\" : \"Qt Creator\",
+ \"Description\" : \"Displays Update-Infos for Qt Installer Framework-based Updaters.\",
+ \"Url\" : \"http://www.qt-project.org\",
+ $$dependencyList
+}
diff --git a/src/plugins/updateinfo/UpdateInfo.pluginspec.in b/src/plugins/updateinfo/UpdateInfo.pluginspec.in
deleted file mode 100644
index 8e51b9f75f..0000000000
--- a/src/plugins/updateinfo/UpdateInfo.pluginspec.in
+++ /dev/null
@@ -1,17 +0,0 @@
-<plugin name=\"UpdateInfo\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_COMPAT_VERSION\" experimental=\"$$UPDATEINFO_EXPERIMENTAL_STR\">
- <vendor>Digia Plc</vendor>
- <copyright>(C) 2014 Digia Plc</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>Qt Creator</category>
- <description>Displays Update-Infos for Qt Installer Framework-based Updaters.</description>
- <url>http://www.qt-project.org</url>
- $$dependencyList
-</plugin>
diff --git a/src/plugins/updateinfo/updateinfo.qbs b/src/plugins/updateinfo/updateinfo.qbs
index 47b26a895e..6841a0a0e6 100644
--- a/src/plugins/updateinfo/updateinfo.qbs
+++ b/src/plugins/updateinfo/updateinfo.qbs
@@ -11,7 +11,7 @@ QtcPlugin {
Depends { name: "Core" }
property bool enable: false
- pluginspecreplacements: ({"UPDATEINFO_EXPERIMENTAL_STR": (enable ? "false": "true")})
+ pluginJsonReplacements: ({"UPDATEINFO_EXPERIMENTAL_STR": (enable ? "false": "true")})
files: [
"updateinfobutton.cpp",