New methods: pluginVersion() and pythonVersion()

docs/index.rst

@@ -114,6 +114,21 @@ the QML UI thread:
 
     Call a Python function. Returns the return value of the Python function.
 
+The following functions allow access to the version of the running PyOtherSide
+plugin and Python interpreter.
+
+.. function:: pluginVersion() -> string
+
+    Get the version of the PyOtherSide plugin that is currently used.
+
+.. versionadded:: 1.1.0
+
+.. function:: pythonVersion() -> string
+
+    Get the version of the Python interpreter that is currently used.
+
+.. versionadded:: 1.1.0
+
 Python API
 ==========
 
@@ -664,6 +679,7 @@ Version 1.1.0 (2014-02-XX)
 * Add support for Python-based image providers (see `Image Provider`_).
 * Fix threading crashes and aborts due to assertions.
 * :func:`addImportPath` will automatically strip a leading ``file://``.
+* Added :func:`pluginVersion` and :func:`pythonVersion` for runtime version detection.
 
 Version 1.0.0 (2013-08-08)
 --------------------------

examples/helloworld.qml

@@ -16,6 +16,10 @@ Rectangle {
         id: python
 
         Component.onCompleted: {
+            // Print version of plugin and Python interpreter
+            console.log('PyOtherSide version: ' + pluginVersion());
+            console.log('Python version: ' + pythonVersion());
+
             // Asynchronous module importing
             importModule('os', function() {
                 console.log('Python module "os" is now imported');

pyotherside.pri

@@ -0,0 +1,2 @@
+PROJECTNAME = pyotherside
+VERSION = 1.1.0

src/qpython.cpp

@@ -252,3 +252,15 @@ QPython::imported(bool result, QJSValue *callback)
     callback->call(args);
     delete callback;
 }
+
+QString
+QPython::pluginVersion()
+{
+    return QString(PYOTHERSIDE_VERSION);
+}
+
+QString
+QPython::pythonVersion()
+{
+    return QString(PY_VERSION);
+}

src/qpython.h

@@ -236,6 +236,23 @@ class QPython : public QObject {
         Q_INVOKABLE QVariant
         call_sync(QString func, QVariant args=QVariantList());
 
+
+        /**
+         * \brief Get the PyOtherSide version
+         *
+         * \result The running version of PyOtherSide
+         **/
+        Q_INVOKABLE QString
+        pluginVersion();
+
+        /**
+         * \brief Get the Python versino
+         *
+         * \result The running versino of Python
+         **/
+        Q_INVOKABLE QString
+        pythonVersion();
+
     signals:
         /**
          * \brief Default event handler for \c pyotherside.send()

src/src.pro

@@ -1,5 +1,9 @@
 TARGET = pyothersideplugin
 
+include(../pyotherside.pri)
+
+DEFINES += PYOTHERSIDE_VERSION=\\\"$${VERSION}\\\"
+
 PLUGIN_IMPORT_PATH = io/thp/pyotherside
 
 TEMPLATE = lib

tests/tests.pro

@@ -1,6 +1,9 @@
 QT += testlib qml
 CONFIG -= app_bundle
 
+include(../pyotherside.pri)
+DEFINES += PYOTHERSIDE_VERSION=\\\"$${VERSION}\\\"
+
 SOURCES += tests.cpp
 HEADERS += tests.h