From b5f6229863a417c2ed5461ca1e07420a4b44d509 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Sat, 15 Jun 2013 14:42:20 +0200
Subject: [PATCH] - completed Qt5 compatibility - added GetFileVerisonInfoW
 hook for Windows 8 compatibility - fixed BossDummy to compile correctly with
 current version of the RGiesecke.DllExport assembly - fixed NCC components
 compiling with different Framewerk versions - dropped files-list in Nexus-tab
 of modinfo dialog

---
 src/proxy/proxyPython.pro  | 13 +++++++++++--
 src/proxy/proxypython.cpp  |  2 ++
 src/proxy/proxypython.h    |  3 +++
 src/proxy/proxypython.json |  1 +
 4 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 src/proxy/proxypython.json

diff --git a/src/proxy/proxyPython.pro b/src/proxy/proxyPython.pro
index 005d66e..a894e88 100644
--- a/src/proxy/proxyPython.pro
+++ b/src/proxy/proxyPython.pro
@@ -8,6 +8,10 @@
 TARGET = proxyPython
 TEMPLATE = lib
 
+contains(QT_VERSION, "^5.*") {
+  QT += widgets
+}
+
 CONFIG += plugins
 CONFIG += dll
 CONFIG += warn_on
@@ -15,7 +19,7 @@ CONFIG += warn_on
 DEFINES += PROXYPYTHON_LIBRARY
 
 INCLUDEPATH += "$(BOOSTPATH)" "$$(PYTHONPATH)/include"
-INCLUDEPATH += "$$(SIPPATH)/siplib"
+# INCLUDEPATH += "$$(SIPPATH)/siplib"
 
 SOURCES += proxypython.cpp \
     proxypluginwrappers.cpp \
@@ -36,7 +40,8 @@ OTHER_FILES += \
 		INexusBridge.sip \
 		interfaces.sip \
     setup.py \
-    setup.cfg
+    setup.cfg \
+    proxypython.json
 
 WINPWD = $$PWD
 WINPWD ~= s,/,$$QMAKE_DIR_SEP,g
@@ -45,3 +50,7 @@ WINPWD ~= s,/,$$QMAKE_DIR_SEP,g
 SIPPATH=""
 
 QMAKE_POST_LINK += SET VS90COMNTOOLS=%VS100COMNTOOLS% $$escape_expand(\\n)
+
+QMAKE_POST_LINK += copy $$(PYTHONPATH)\\lib\\site-packages\\sip.pyd $$quote($$DSTDIR)\\plugins\\data\\ $$escape_expand(\\n)
+QMAKE_POST_LINK += copy $$(PYTHONPATH)\\lib\\site-packages\\PyQt4\\QtCore.pyd $$quote($$DSTDIR)\\plugins\\data\\ $$escape_expand(\\n)
+QMAKE_POST_LINK += copy $$(PYTHONPATH)\\lib\\site-packages\\PyQt4\\QtGui.pyd $$quote($$DSTDIR)\\plugins\\data\\ $$escape_expand(\\n)
diff --git a/src/proxy/proxypython.cpp b/src/proxy/proxypython.cpp
index 980f7d4..a400bac 100644
--- a/src/proxy/proxypython.cpp
+++ b/src/proxy/proxypython.cpp
@@ -714,4 +714,6 @@ QObject *ProxyPython::instantiate(const QString &pluginName)
 }
 
 
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
 Q_EXPORT_PLUGIN2(proxyPython, ProxyPython)
+#endif
diff --git a/src/proxy/proxypython.h b/src/proxy/proxypython.h
index ec683c2..286a43a 100644
--- a/src/proxy/proxypython.h
+++ b/src/proxy/proxypython.h
@@ -14,6 +14,9 @@ class ProxyPython : public QObject, MOBase::IPluginProxy
 {
   Q_OBJECT
   Q_INTERFACES(MOBase::IPlugin MOBase::IPluginProxy)
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+  Q_PLUGIN_METADATA(IID "org.tannin.ProxyPython" FILE "proxypython.json")
+#endif
 
 public:
   ProxyPython();
diff --git a/src/proxy/proxypython.json b/src/proxy/proxypython.json
new file mode 100644
index 0000000..69a88e3
--- /dev/null
+++ b/src/proxy/proxypython.json
@@ -0,0 +1 @@
+{}