Skip to content

Svn mirror update to revision r248 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Svn mirror update to revision r248 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f9196c
made generator compile on VC11
Oct 23, 2013
83436b9
removed event() method from QClipboard and QWebFrame to avoid derivin…
Oct 23, 2013
15004aa
fixed wrong inplace operator function assignment
Nov 5, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions generator/parser/rpp/pp-iterator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<std::output_iterator_tag, void, void, void, void>*)(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 ())
Expand Down
1 change: 1 addition & 0 deletions generator/typesystem_gui.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4539,6 +4539,7 @@ PyObject* constScanLine(QImage* image, int line) {
<include file-name="QImage" location="global"/>
<include file-name="QPixmap" location="global"/>
</extra-includes>
<modify-function signature="event(QEvent*)" remove="all"/>
<modify-function signature="setMimeData(QMimeData *, QClipboard::Mode)">
<modify-argument index="1">
<define-ownership class="java" owner="c++"/>
Expand Down
1 change: 1 addition & 0 deletions generator/typesystem_webkit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
<reference-count action="ignore"/>
</modify-argument>
</modify-function>
<modify-function signature="event(QEvent*)" remove="all"/>
</object-type>
<object-type name="QWebPage::ExtensionOption"/>
<object-type name="QWebPage::ChooseMultipleFilesExtensionOption"/>
Expand Down
6 changes: 3 additions & 3 deletions src/PythonQtClassWrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down