aboutsummaryrefslogtreecommitdiffstats
path: root/libpyside
Commit message (Collapse)AuthorAgeFilesLines
* 1. These 2 new functions could be suppressed by editing ↵zhihaoadsk2016-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PySide2/QtTest/typesystem_test.xml 2. Also fixed typo: Qt5Webkit -> Qt5WebKit 3. fixed global.h.in (@Qt5WebEngine_FOUND@ should be @Qt5WebEngineWidgets_FOUND@) 4. And fixed a couple of crash (more condition check). `Scanning dependencies of target QtTest [ 82%] Building CXX object PySide2/QtTest/CMakeFiles/QtTest.dir/PySide2/QtTest/qtest_pysideqtoucheventsequence_wrapper.cpp.o [ 82%] Building CXX object PySide2/QtTest/CMakeFiles/QtTest.dir/PySide2/QtTest/qtest_wrapper.cpp.o /Volumes/data2/mayadev/pyside/2.0qt56/pyside2-setup/pyside_build/py2.7-qt5.6.0-64bit-release/pyside2/PySide2/QtTest/PySide2/QtTest/qtest_wrapper.cpp:3836:40: error: expected ';' after top level declarator static PyObject* Sbk_QTestFunc_toString(PyObject* self, PyObject* pyArg) ^ ; /Volumes/data2/mayadev/pyside/2.0qt56/pyside2-setup/pyside_build/py2.7-qt5.6.0-64bit-release/pyside2/PySide2/QtTest/PySide2/QtTest/qtest_wrapper.cpp:4120:7: error: unexpected namespace name 'QTest': expected expression ::QTest* cppSelf = 0; ^ /Volumes/data2/mayadev/pyside/2.0qt56/pyside2-setup/pyside_build/py2.7-qt5.6.0-64bit-release/pyside2/PySide2/QtTest/PySide2/QtTest/qtest_wrapper.cpp:4120:14: error: use of undeclared identifier 'cppSelf' ::QTest* cppSelf = 0; ^ /Volumes/data2/mayadev/pyside/2.0qt56/pyside2-setup/pyside_build/py2.7-qt5.6.0-64bit-release/pyside2/PySide2/QtTest/PySide2/QtTest/qtest_wrapper.cpp:4121:16: error: use of undeclared identifier 'cppSelf' SBK_UNUSED(cppSelf) ^ /Volumes/data2/mayadev/pyside/2.0qt56/pyside2-setup/pyside_install/py2.7-qt5.6.0-64bit-release/include/shiboken2/helper.h:31:31: note: expanded from macro 'SBK_UNUSED' #define SBK_UNUSED(x) (void)x; ^ /Volumes/data2/mayadev/pyside/2.0qt56/pyside2-setup/pyside_build/py2.7-qt5.6.0-64bit-release/pyside2/PySide2/QtTest/PySide2/QtTest/qtest_wrapper.cpp:4124:5: error: use of undeclared identifier 'cppSelf' cppSelf = ; ^ /Volumes/data2/mayadev/pyside/2.0qt56/pyside2-setup/pyside_build/py2.7-qt5.6.0-64bit-release/pyside2/PySide2/QtTest/PySide2/QtTest/qtest_wrapper.cpp:4124:15: error: expected expression cppSelf = ; ` The toString and toString errors are caused by changes in QtTest/qtestcase.h #define QTEST_COMPARE_DECL(KLASS)\ template<> Q_TESTLIB_EXPORT char *toString(const KLASS &); Qt 5.6 has the following new lines in qtestcase.h: QTEST_COMPARE_DECL(signed char) QTEST_COMPARE_DECL(unsigned char) shiboken picked up the new functions in Qt 5.6 These 2 new functions could be suppressed by editing PySide2/QtTest/typesystem_test.xml
* Fix building signalmanager.cpp with Qt 5.4.x.Mateusz Skowroński2016-02-031-0/+3
|
* Fix building signalmanager.cpp with Qt < 5.5.0.Mateusz Skowroński2016-02-011-3/+20
| | | | | | | | 1. Heap namespace has been introduced in Qt 5.5.0. 2. Throw methods have been moved from ExecutionContext to ExecutionEngine in Qt 5.5.0. Source 1: https://github.com/qtproject/qtdeclarative/commit/84aae25c0b3003fb846568cf26a2c7150db14d9d Source 2: https://github.com/qtproject/qtdeclarative/commit/486948817b26da2c62802bb93a0f671715c609d4
* Fix bug #54.Mateusz Skowroński2016-01-301-2/+2
|
* Renaming shiboken's SHIBOKEN_PYTHON_SUFFIX to SHIBOKEN_PYTHON_EXTENSION_SUFFIXThomas-Karl Pietrowski2016-01-234-10/+10
|
* Only use engine->current in Qt 5.6 and upempyrical2015-12-281-0/+5
|
* Fix private API usage for Qt 5.6empyrical2015-12-151-1/+1
|
* Merge pull request #44 from empyrical/deleted-obj-signal-segfaultChristian Tismer2015-12-131-1/+1
|\ | | | | Fix segfault when disconnecting signal on deleted object
| * Merge commit 'refs/changes/14/110414/5' of ↵empyrical2015-12-121-1/+1
| |\ | | | | | | | | | | | | | | | | | | https://codereview.qt-project.org/pyside/pyside into deleted-obj-signal-segfault From this Gerrit patch: https://codereview.qt-project.org/#/c/110414/
| | * Fix segfault when disconnecting signal on deleted objectTony Roberts2015-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When disconnecting a signal on object that has been destroyed the disconnect call (Sbk_QObjectFunc_disconnect) fails and returns 0 with an error set. The calling function (signalInstanceDisconnect) was segfaulting because it decrements the reference count of the returned value. As the Python error is already set it's sufficient for signalInstanceDisconnect to return 0 in this case. Change-Id: If857961c0d64360045c1f2ba5855881e2a9aae43 Task-number: PYSIDE-189
* | | Merge pull request #43 from empyrical/use-after-freeChristian Tismer2015-12-131-1/+2
|\ \ \ | | | | | | | | Fix use-after-free in QProperty
| * \ \ Merge commit 'refs/changes/52/84452/3' of ↵empyrical2015-12-121-1/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | https://codereview.qt-project.org/pyside/pyside into use-after-free From this Gerrit patch: https://codereview.qt-project.org/#/c/84452/
| | * | Fix use-after-free in QPropertyPankaj Pandey2014-07-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PropertyData::type() returns a new QByteArray (whose `data` is a copy of the `char*` name of the property) However the use of `type().data()` on the stack without saving its reference means the `char*` returned by the `data()` method is immediately deallocated in the the `~QByteArray` destructor. (Detected by AddressSanitizer) The attached patch fixes it by holding a reference to the QByteArray returned by `type()` for the duration of the method call Change-Id: Ia794a1215da7ba4bada19091e6d6acf3e6584c70
* | | | Merge pull request #42 from empyrical/fix-signal-deadlocksChristian Tismer2015-12-131-2/+15
|\ \ \ \ | | | | | | | | | | Fix deadlocks in some more places in signals
| * \ \ \ Merge commit 'refs/changes/49/94249/3' of ↵empyrical2015-12-121-2/+15
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | https://codereview.qt-project.org/pyside/pyside into fix-signal-deadlocks From this patch: https://codereview.qt-project.org/#/c/94249/
| | * | | Fix deadlocks in some more places in signals.Pankaj Pandey2015-08-271-2/+15
| | | |/ | | |/| | | | | | | | | | | | | | | | | Release GIL before connect/disconnect/emit of Qt signals. Change-Id: Id7aa5dedb38461fb179e56d4ae9e309e9a5baa30
* | / | Throw an exception in Qml when one happens in Pythonempyrical2015-12-123-16/+78
|/ / /
* | | Add additional checks to ClassInfoempyrical2015-11-211-2/+15
| | |
* | | Add better error handling to QtCore.ClassInfo()empyrical2015-11-202-5/+39
| | |
* | | Fix void return type on slotsempyrical2015-11-142-2/+2
| | |
* | | fix metaobject and signal/slotsjumaroch2015-11-043-115/+216
| | |
* | | remove QtDeclarative, which is deprecatedChristian Tismer2015-10-221-1/+1
| | |
* | | finally, pyside needs to be renamed in the XML filesChristian Tismer2015-09-222-5/+5
| | | | | | | | | | | | | | | The XML names like "PySide.QtCore" go into the binaries for import, so it is necessary to change them all. There are also hundreds of Python files which must bechanged, as well.
* | | not-so-small fix to the huge change.Christian Tismer2015-09-216-37/+42
| | | | | | | | | | | | | | | | | | I just understood what is needed to define a package: The files PySide2Config(...).cmake are crucial, the project names have little to do with that.
* | | huge change on project layout.Christian Tismer2015-09-213-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The intention is to have PySide2 and Shiboken2 as project names, to allow for co-existence of PySide and PySide2. This is the first version that builds with these settings on OS X: $ python3 setup.py build --debug --no-examples --ignore-git --qmake=/usr/local/Cellar/qt5/5.5.0/bin/qmake --jobs=9 This is not yet tested.
* | | add an include to signal manager.cpp . This problem was new with Windows and ↵Christian Tismer2015-09-171-0/+1
| | | | | | | | | | | | Qt5.5.
* | | start fixing dynamicqmetaobject.cpp by first changing the revision from 3 to 7.Christian Tismer2015-09-011-1/+1
| | | | | | | | | | | | | | | This drastic change is just the beginning of more changes. It shows the real problem, which was hidden due to the revision mismatch.
* | | improve the windows installer to handle backslash properlyChristian Tismer2015-08-161-1/+1
| | |
* | | adjust certain headers from 'class' to 'struct' and remove hundreds of ↵Christian Tismer2015-06-272-2/+2
| | | | | | | | | | | | annoying warnings
* | | try to compile as much as possible, remove phonon, edit many files.Christian Tismer2015-06-131-1/+2
| | | | | | | | | | | | | | | | | | | | | Right now, the compiling/breaking ratio on QtCore looks like 50%. There are a couple of errors which seem to repeat all the time. This is still work in progress, takes many hours and will hopefully result in a build, tomorrow.
* | | basic adaptations for QtCore. Right now it does not generate all wrappers, ↵Christian Tismer2015-06-111-1/+1
| | | | | | | | | | | | hunting the bug...
* | | make libpyside compileChristian Tismer2015-06-099-18/+18
| | |
* | | do first adaptations of the cmake files, so that the first compilation is ↵Christian Tismer2015-06-091-1/+1
|/ / | | | | | | attempted
* / PYSIDE-164: Fix possible deadlock on signal connect/emitps-4.8-headPankaj Pandey2014-07-081-0/+2
|/ | | | | | | | | | | Signal connect/emit acquire a lock on the QObject, and can happen from python code (which has acquired the GIL) or internal QtCode (without acquiring the GIL). So we always need to release the GIL to prevent out-of-order acquisition of the locks causing deadlock. Change-Id: I1cf47a73c2b60627e322d8ef3fa4c3efdebd4c02 Reviewed-by: John Ehresman <jpe@wingware.com>
* Fix PYSIDE-190Pankaj Pandey2014-04-151-0/+5
| | | | | | | | | | QCoreApplication would deadlock on exit if the global QThreadPool.globalInstance() is running a QRunnable with python code because the destroyQCoreApplication function would not release the the GIL which `delete`ing the QCoreApplication. Change-Id: I7b8a3bbd33f86050368a9357fa93e25a642b4ac5 Reviewed-by: John Ehresman <jpe@wingware.com>
* Fix shadowed virtualsMatthew Woehlke2014-04-151-0/+4
| | | | | | | | | Change GlobalReceiver to explicitly 'use' [dis]connectNotify of the base class in order to avoid hiding these with its own overloads. This fixes the only (current) -Woverloaded-virtual warning. Change-Id: I364b9939f9078029861054051148c319071fbbe1 Reviewed-by: John Ehresman <jpe@wingware.com>
* Avoid narrowing conversionMatthew Woehlke2014-04-151-8/+8
| | | | | | | | | Add explicit casts when initializing an int[] using {}'s, as required by C++11 to be "well formed". This fixes the only (current) -Wnarrowing warning. Change-Id: I7f190549a8a54a9061678a926d5478256c2084be Reviewed-by: John Ehresman <jpe@wingware.com>
* Fix potential segfault at shutdownJohn Ehresman2013-07-011-0/+5
| | | | | | | | Check Py_IsInitialized() in PyObjectWrapper destructor, which can be called after interpreter shutdown Change-Id: If9570d14a35ac3419a81846a59d972015205a858 Reviewed-by: John Cummings <jcummings2@users.sf.net>
* fix build in C++11 modeMatthew Woehlke2013-06-223-8/+8
| | | | | | | | | | Add spaces between string literals and preprocessor symbols. These are required because C++11 defines string prefix and suffix operators, and confuses preprocessor tokens adjacent to string literals as unrecognized string literal modifies, resulting in compile errors. Change-Id: I70f4efca0acb6d2ee03327c0afbc56fe7d82c2a3 Reviewed-by: John Ehresman <jpe@wingware.com>
* Replaced Nokia copyrights and contact detailsTeemu Kaukoranta2013-05-2829-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced Nokia copyrights with correct Digia copyrights. Text in front of copyright is now retained: ** File is part of Foo, Copyright Nokia... -> ** File is part of Foo, Copyright Digia... Replaced Nokia contact details with Digia's. Removing "All Rights Reserved" no longer leaves an empty line. Used the following command: find . -path '*/3rdparty/*' -prune -o -exec grep -ilI -E '.*Copyright.*Nokia.*|.*Contact.*' {} \; | tee >(xargs sed -i -r '1,50 { /INdT|copy[a-z]*[ ]*=/ !{ s/(^[ \t:#*]*)([a-z ]*) (Copyright.*Nokia.*)/ \1\2Copyright \(C\) 2013 Digia Plc and\/or its subsidiary\(-ies\)\./I }}') >(xargs sed -i -r '1,50 s/(^[ \t:#*]*)(.*info@qt\.nokia\.com.* |.*INSERT EMAIL ADDRESS.*|.*qt-info@nokia\.com.* |.*qt-label1@nokia\.com.*|.*http:\/\/qt\.nokia\.com\/contact.* |.*qt-sales@nokia\.com.*|.*http:\/\/www\.qt-project\.org\/.*)/ \1Contact: http:\/\/www\.qt-project\.org\/legal/I') >(xargs sed -i -r '1,50{/(^[ \t:#*]*)(all rights reserved.*)/Id}') Command now finds command details that point to qt-project.org and changes them to qt-project.org/legal Also no longer wrongly replaces code snippet "copyright = ..". Need to fix these case-by-case later. Change-Id: I4456c00202c4a2264a400bdc18c19cd097876861 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Use QObject property to invalidate wrapper before deletion.John Ehresman2012-12-212-0/+54
| | | | | | | | | | | | Define a getWrapperForQObject function to create / find wrappers for QObject derived objects. It sets a property so that an invalidate function can be called when the QObject property is cleared in the QObject destructor after all destroyed signal handlers have been called. Requires a change to shiboken to generate calls to the getWrapperForQObject function. Change-Id: I4ed548af114bf7176e8e8255a3ea70549c35d74c Reviewed-by: Hugo Parente Lima <hugo.lima@openbossa.org>
* Invalidate metaObject wrapper before deletionJohn Ehresman2012-12-201-2/+11
| | | | | Change-Id: I95d3f8dd4a8473849ca19b5c8d5d59dee4c42991 Reviewed-by: Hugo Parente Lima <hugo.lima@openbossa.org>
* During signal emission don't get return type after callbackJohn Ehresman2012-07-311-11/+14
| | | | | | | | | The callback can disconnect the slot, causing the C++ object for the connection to be deleted. Accessing the return type would then read already freed memory. Change-Id: Ib33fa806978793bcac42167dd45f1e59829a3104 Reviewed-by: Marcelo Lira <marcelo.lira@openbossa.org>
* Bug pyside-35: GIL was not acquired in several important places.Jason McCampbell (Enthought, Inc)2012-04-193-0/+7
| | | | | Change-Id: I876732f90690d9679537611e9a71e33aa3a4e4e3 Reviewed-by: Hugo Parente Lima <hugo.lima@openbossa.org>
* Fixes the QSettings related QVariant's save/load bug.Marcelo Lira2012-03-081-0/+2
|
* Small code style changes.Hugo Parente Lima2012-03-081-6/+4
|
* Add GC support to PySide Property type.Hugo Parente Lima2012-03-081-22/+46
| | | | | | This fixes GC errors when running PySide on a Python debug env. Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
* Replaced TypeResolver by SbkConverter and SpecificConverter.Marcelo Lira2012-03-086-34/+68
| | | | Also updated QtGui's WId conversion to Python 3.
* Modified PySideQFlags based on Hugo's design.Marcelo Lira2012-03-081-1/+4
|
* pysidesignal: more trivial fixesPaulo Alcantara2012-03-081-20/+23
| | | | | | | Fix typos and coding style. Signed-off-by: Paulo Alcantara <pcacjr@gmail.com> Reviewed-by: Marcelo Lira <marcelo.lira@openbossa.org>