diff --git a/generator/parser/rpp/pp-iterator.h b/generator/parser/rpp/pp-iterator.h index d982efb3..90d31b0f 100644 --- a/generator/parser/rpp/pp-iterator.h +++ b/generator/parser/rpp/pp-iterator.h @@ -71,6 +71,14 @@ class pp_output_iterator explicit pp_output_iterator(std::string &__result): _M_result (__result) {} + // this copy constructor was needed for Visual Studio 2012 release builds: + inline pp_output_iterator &operator=(const pp_output_iterator& other) + { + *(std::iterator*)(this) = other; + _M_result = other._M_result; + return *this; + } + inline pp_output_iterator &operator=(typename _Container::const_reference __v) { if (_M_result.capacity () == _M_result.size ()) diff --git a/generator/typesystem_gui.xml b/generator/typesystem_gui.xml index a42a1089..8bb90a87 100644 --- a/generator/typesystem_gui.xml +++ b/generator/typesystem_gui.xml @@ -4539,6 +4539,7 @@ PyObject* constScanLine(QImage* image, int line) { + diff --git a/generator/typesystem_webkit.xml b/generator/typesystem_webkit.xml index 92ea3d99..57d93773 100644 --- a/generator/typesystem_webkit.xml +++ b/generator/typesystem_webkit.xml @@ -46,6 +46,7 @@ + diff --git a/src/PythonQtClassWrapper.cpp b/src/PythonQtClassWrapper.cpp index 17ffbcf6..5b1fc633 100644 --- a/src/PythonQtClassWrapper.cpp +++ b/src/PythonQtClassWrapper.cpp @@ -179,13 +179,13 @@ static void initializeSlots(PythonQtClassWrapper* wrap) } if (typeSlots & PythonQt::Type_InplaceAdd) { - wrap->_base.as_number.nb_add = (binaryfunc)PythonQtInstanceWrapper_iadd; + wrap->_base.as_number.nb_inplace_add = (binaryfunc)PythonQtInstanceWrapper_iadd; } if (typeSlots & PythonQt::Type_InplaceSubtract) { - wrap->_base.as_number.nb_subtract = (binaryfunc)PythonQtInstanceWrapper_isub; + wrap->_base.as_number.nb_inplace_subtract = (binaryfunc)PythonQtInstanceWrapper_isub; } if (typeSlots & PythonQt::Type_InplaceMultiply) { - wrap->_base.as_number.nb_multiply = (binaryfunc)PythonQtInstanceWrapper_imul; + wrap->_base.as_number.nb_inplace_multiply = (binaryfunc)PythonQtInstanceWrapper_imul; } if (typeSlots & PythonQt::Type_InplaceDivide) { wrap->_base.as_number.nb_inplace_divide = (binaryfunc)PythonQtInstanceWrapper_idiv;