From 8ed80ad95f05f1b68025ef17eda19b7c8bb65ecc Mon Sep 17 00:00:00 2001
From: noKid <quentin.de.gr@gmail.com>
Date: Mon, 21 Dec 2015 12:44:47 +0100
Subject: [PATCH] OS X Build: Added qt.conf to prevent QT from mixing plugins
with system-installed versions.
---
res/osx/qt.conf | 2 ++
setup.py | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
create mode 100644 res/osx/qt.conf
diff --git a/res/osx/qt.conf b/res/osx/qt.conf
new file mode 100644
index 00000000..45c6297b
--- /dev/null
+++ b/res/osx/qt.conf
@@ -0,0 +1,2 @@
+[Paths]
+Plugins = '.'
diff --git a/setup.py b/setup.py
index d5b0ef10..825b1954 100644
--- a/setup.py
+++ b/setup.py
@@ -71,7 +71,8 @@ if sys.platform == "darwin":
else:
print("Erreur : libsodium not found. Please install it with brew install libsodium.")
-
+ qtconf_path = os.path.join(os.path.dirname(__file__), "res/osx/qt.conf")
+ includefiles.append((qtconf_path, "qt.conf"))
print("Includes : ")
print(includes)
--
GitLab