Skip to content
Browse files

COMP: Update version PythonQt to integrate latest fixes

The "patched-3" branch is rebased against r244 of PythonQt, it integrates
all backported changes specific to "patched-2" and also
include improvements by the upstream team. For a detailed list,
see commontk/PythonQt@e2dce4...0a2486

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21847 3bd1e089-480b-0410-8dfb-8563597acbee
  • Loading branch information...
1 parent 551f750 commit 12b3e670cdb02c7f71133a85095186c9297ff82a @jcfr jcfr committed
View
2 Base/QTGUI/qSlicerScriptedLoadableModule.cxx
@@ -236,7 +236,7 @@ void qSlicerScriptedLoadableModule::setup()
{
return;
}
- PythonQt::self()->resetErrorFlag();
+ PythonQt::self()->clearError();
PyObject_CallObject(method, 0);
PythonQt::self()->handleError();
}
View
6 Base/QTGUI/qSlicerScriptedLoadableModuleWidget.cxx
@@ -235,7 +235,7 @@ void qSlicerScriptedLoadableModuleWidget::setup()
{
return;
}
- PythonQt::self()->resetErrorFlag();
+ PythonQt::self()->clearError();
PyObject_CallObject(method, 0);
PythonQt::self()->handleError();
}
@@ -250,7 +250,7 @@ void qSlicerScriptedLoadableModuleWidget::enter()
{
return;
}
- PythonQt::self()->resetErrorFlag();
+ PythonQt::self()->clearError();
PyObject_CallObject(method, 0);
PythonQt::self()->handleError();
}
@@ -265,7 +265,7 @@ void qSlicerScriptedLoadableModuleWidget::exit()
{
return;
}
- PythonQt::self()->resetErrorFlag();
+ PythonQt::self()->clearError();
PyObject_CallObject(method, 0);
PythonQt::self()->handleError();
}
View
2 SuperBuild/External_CTK.cmake
@@ -66,7 +66,7 @@ if(NOT DEFINED CTK_DIR)
ExternalProject_Add(${proj}
GIT_REPOSITORY "${git_protocol}://github.com/commontk/CTK.git"
- GIT_TAG "d52f1469eab6c8dc10464dab9178cb61e63c9048"
+ GIT_TAG "587c5f323adcd28e10fddb150987e6ca65009bb2"
"${${PROJECT_NAME}_EP_UPDATE_IF_GREATER_288}"
SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
BINARY_DIR ${proj}-build

0 comments on commit 12b3e67

Please sign in to comment.
Something went wrong with that request. Please try again.