From 86d2ce34f3bfb8b8dae84dce2630ba37b2835ad7 Mon Sep 17 00:00:00 2001 From: Thomas Tanner Date: Sun, 8 Nov 2015 23:15:55 +0000 Subject: [PATCH] Fix compilation issues with clang, requires adding widgets to build --- src/runner/SConscript | 2 +- src/runner/proxypluginwrappers.cpp | 1 + src/runner/pythonRunner.pro | 1 + src/runner/pythonrunner.cpp | 3 ++- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/runner/SConscript b/src/runner/SConscript index 5d2eab3..0f25b4e 100644 --- a/src/runner/SConscript +++ b/src/runner/SConscript @@ -2,7 +2,7 @@ Import('qt_env') env = qt_env.Clone() -env.EnableQtModules('Core', 'Gui') +env.EnableQtModules('Core', 'Gui', 'Widgets') env.AppendUnique(CPPDEFINES = 'PYTHONRUNNER_LIBRARY') diff --git a/src/runner/proxypluginwrappers.cpp b/src/runner/proxypluginwrappers.cpp index b5d3b6a..49d458c 100644 --- a/src/runner/proxypluginwrappers.cpp +++ b/src/runner/proxypluginwrappers.cpp @@ -2,6 +2,7 @@ #include #include "error.h" #include "gilock.h" +#include namespace bpy = boost::python; diff --git a/src/runner/pythonRunner.pro b/src/runner/pythonRunner.pro index 34c26b7..e1409e5 100644 --- a/src/runner/pythonRunner.pro +++ b/src/runner/pythonRunner.pro @@ -9,6 +9,7 @@ TEMPLATE = lib CONFIG += dll CONFIG += warn_on +QT += widgets DEFINES += PYTHONRUNNER_LIBRARY diff --git a/src/runner/pythonrunner.cpp b/src/runner/pythonrunner.cpp index bdc85f0..47b3881 100644 --- a/src/runner/pythonrunner.cpp +++ b/src/runner/pythonrunner.cpp @@ -11,6 +11,7 @@ #include #include #include +#include // sip and qt slots seems to conflict #include @@ -905,7 +906,7 @@ bool handled_exec_file(bpy::str filename, bpy::object globals = bpy::object(), b #define TRY_PLUGIN_TYPE(type, var) do { \ - bpy::extract extr(var); \ + bpy::extract extr(var); \ if (extr.check()) { \ QObject *res = extr; \ return res; \