diff --git a/CMakeExternals/CTK.patch b/CMakeExternals/CTK.patch index 5f6a0114fa..fa7fe5f50c 100644 --- a/CMakeExternals/CTK.patch +++ b/CMakeExternals/CTK.patch @@ -1,21 +1,51 @@ diff --git a/CMakeExternals/PythonQt.cmake b/CMakeExternals/PythonQt.cmake index 806797b..b70005d 100644 --- a/CMakeExternals/PythonQt.cmake +++ b/CMakeExternals/PythonQt.cmake @@ -33,7 +33,7 @@ if(NOT DEFINED PYTHONQT_INSTALL_DIR) # Enable Qt libraries PythonQt wrapping if required if (CTK_QT_VERSION VERSION_GREATER "4") - set(qtlibs Core Gui Widgets Network OpenGL PrintSupport Sql Svg UiTools WebKit WebKitWidgets Xml) + set(qtlibs Core Gui Widgets Network OpenGL PrintSupport Sql Svg UiTools Xml) else() list(APPEND ep_PythonQt_args -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} @@ -88,7 +88,6 @@ if(NOT DEFINED PYTHONQT_INSTALL_DIR) BUILD_COMMAND "" CMAKE_CACHE_ARGS ${ep_common_cache_args} - -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR} -DPYTHON_INCLUDE_DIR2:PATH=${PYTHON_INCLUDE_DIR2} -DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY} +diff --git a/Libs/Scripting/Python/Core/ctkAbstractPythonManager.cpp b/Libs/Scripting/Python/Core/ctkAbstractPythonManager.cpp +index 9b9ec055..464cece1 100644 +--- a/Libs/Scripting/Python/Core/ctkAbstractPythonManager.cpp ++++ b/Libs/Scripting/Python/Core/ctkAbstractPythonManager.cpp +@@ -19,6 +19,7 @@ + =========================================================================*/ + + // Qt includes ++#include + #include + #include + +@@ -482,7 +483,7 @@ PyObject* ctkAbstractPythonManager::pythonObject(const QString& variableNameAndF + continue; + } + QString keyStr = PyString_AsString(key); +- if (keyStr.operator ==(compareFunction)) ++ if (keyStr == compareFunction) + { + finalPythonObject = value; + break; +@@ -509,7 +510,7 @@ PyObject* ctkAbstractPythonManager::pythonModule(const QString& module) + } + foreach(const QString& module, moduleList) + { +- object = PyDict_GetItemString(dict, module.toAscii().data()); ++ object = PyDict_GetItemString(dict, module.toLatin1().data()); + if (prevObject) + { + Py_DECREF(prevObject);