summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPranav Kant <pranavk@collabora.com>2016-06-21 20:23:13 +0530
committerPranav Kant <pranavk@collabora.com>2016-06-22 13:50:31 +0530
commit3f1c126f9f4da7113061565218f36ed878010ccd (patch)
tree89af56a3a2440325bc0a0014b5a70846c4e2bf92 /include
parent45c41f548500d794e925db062d527ee38e66557f (diff)
lok: Change version string to JSON format
(cherry-picked from d7b45c97b30f109aff0be6602a8fc8103af71e7f) Leaving out the lokdocview changes intentionally, because we don't need it, and too many merge conflicts. Change-Id: Ie1264fed9964b09006980df2e151e170b48b4082
Diffstat (limited to 'include')
-rw-r--r--include/LibreOfficeKit/LibreOfficeKit.hxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 27f3b358dda0..c9e0873cb680 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -543,10 +543,13 @@ public:
/**
* Get version information of the LOKit process
*
- * @returns string containing version information in format:
- * PRODUCT_NAME PRODUCT_VERSION PRODUCT_EXTENSION BUILD_ID
+ * @returns JSON string containing version information in format:
+ * {ProductName: <>, ProductVersion: <>, ProductExtension: <>, BuildId: <>}
*
- * Eg: LibreOffice 5.3 .0.0 alpha0 <commit hash>
+ * Eg: {"ProductName": "LibreOffice",
+ * "ProductVersion": "5.3",
+ * "ProductExtension": ".0.0.alpha0",
+ * "BuildId": "<full 40 char git hash>"}
*/
inline char* getVersionInfo()
{