aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* make libpyside compileChristian Tismer2015-06-0910-20/+20
|
* do first adaptations of the cmake files, so that the first compilation is ↵Christian Tismer2015-06-095-55/+28
| | | | attempted
* PYSIDE-164: Fix possible deadlock on signal connect/emitps-4.8-headPankaj Pandey2014-07-084-3/+58
| | | | | | | | | | | 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>
* Version bumpJohn Ehresman2014-04-221-1/+1
| | | | | Change-Id: I2851b9fa2af6781cddd40bd364ed4a42f5211004 Reviewed-by: John Cummings <jcummings2@users.sf.net>
* 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 bug PYSIDE-172: multiple rules for fileMatthew Woehlke2014-04-151-2/+1
| | | | | | | | | | Remove moc_qpytextobject.cxx from the list of Shiboken-generated files, as it is properly generated by MOC, and being in both places causes some generators (e.g. Ninja) to be unhappy about having multiple rules that (claim to) generate it. Change-Id: I2458502852f792661120f561a59ad9a198286005 Reviewed-by: John Ehresman <jpe@wingware.com>
* use file system encoding instead of assumed 'ascii'Joel B. Mohler2014-04-151-2/+6
| | | | | | | | Task-number: PYSIDE-211 Change-Id: I4233d093cf2abe1eeb006fd836c10d1ddcbc9858 Reviewed-by: Roman Lacko <backup.rlacko@gmail.com> Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: John Ehresman <jpe@wingware.com>
* Register qt.conf in Qt resource system to override the Qt builtinsRoman Lacko2013-08-122-24/+173
| | | | | | | | | | Register qt.conf in Qt resource system to override the built-in configuration variables if there is no default qt.conf in executable folder and qt.conf was not already registered in Qt resource system Change-Id: Ibed9f9e791dab575ef26bc54b351e5f5d4870542 Reviewed-by: John Ehresman <jpe@wingware.com>
* Bump version number to 1.2.1John Ehresman2013-07-221-1/+1
| | | | | | Change-Id: Icc64a1b0f63ae05f897a210664fdb41b4f9746c4 Reviewed-by: Roman Lacko <backup.rlacko@gmail.com> Reviewed-by: John Cummings <jcummings2@users.sf.net>
* add diagnostics and fallbacks for frozen distributionsJoel B. Mohler2013-07-122-8/+30
| | | | | | Change-Id: I519c912999283bf7e07f8d34201f9e67c7d6216e Reviewed-by: Roman Lacko <backup.rlacko@gmail.com> Reviewed-by: John Ehresman <jpe@wingware.com>
* Fixed licensesRoman Lacko2013-07-112-8/+8
| | | | | Change-Id: I55b76b47b1dca0ea290f633b1de070bb8d6995e1 Reviewed-by: John Ehresman <jpe@wingware.com>
* Bump the library version number to 1.2John Ehresman2013-07-011-4/+4
| | | | | | Change-Id: Ibf0cf933d9922a4ca0e79e910f979d52c675301e Reviewed-by: Roman Lacko <backup.rlacko@gmail.com> Reviewed-by: John Cummings <jcummings2@users.sf.net>
* Set up PYTHONPATH for tests correctlyJohn Ehresman2013-07-011-2/+2
| | | | | Change-Id: I1136418671fc06310310551ad5631ef1aa4b8b32 Reviewed-by: John Cummings <jcummings2@users.sf.net>
* 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 PYSIDE-61Stefan Landvogt2013-06-291-27/+37
| | | | | | | | | | | | | | The original author of the test did not know how to create one webview after the other after one webview finished loading, so the old approach segfaulted, because it tried to access variables that were already freed. The new approach simply creates webviews with a timer after the previous webview finished loading. It is also using UsesQApplication instead of creatig the qApp manually. Change-Id: I871e7a238398d96e110e89872634a9c5f3b5bc12 Reviewed-by: John Ehresman <jpe@wingware.com>
* Tell Qt to look for qml imports in the PySide packageRoman Lacko2013-06-225-1/+152
| | | | | Change-Id: Ia7565955f8a3b58c8c57631e13bb56a2793b702a Reviewed-by: John Ehresman <jpe@wingware.com>
* 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>
* Fix QByteArray memory leakJohn Ehresman2013-06-211-1/+1
| | | | | | | QByteArray leaked memory when constructed from Python 2 str Change-Id: I0e2ea21ba1bd32d9519704baa7dd42e5224e9ed3 Reviewed-by: John Cummings <jcummings2@users.sf.net>
* Ignore QtCore import errors when initializing plugins folderRoman Lacko2013-05-291-7/+15
| | | | | Change-Id: If7612f97bb03f353d644b26767b3867f04d17fff Reviewed-by: John Ehresman <jpe@wingware.com>
* Replaced Nokia copyrights and contact detailsTeemu Kaukoranta2013-05-28446-847/+818
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Fixed licensesTeemu Kaukoranta2013-05-23364-3618/+3647
| | | | | | | | | License fixed using replace-licenses.zsh from mkdist repo. Possible copyright and contact changes will come later. Change-Id: I18b977ac33f1b00e99fa7aae6c1a824769ce5f6e Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Preload OpenSSL DLLs on Windows.Robin Dunn2013-05-171-6/+23
| | | | | | | | | Add code to _setupQtDirectories that will preload the OpenSSL DLLs if they are included in the PySide package. It uses a trick of temporarily modifying the PATH so Qt's QSystemLibrary will be able to find them. Change-Id: I67b56642ef74444f19806b52c6a1080dc6d92996 Reviewed-by: John Ehresman <jpe@wingware.com>
* Look first in the PySide package for Qt's plugins folder,Robin Dunn2013-05-141-0/+16
| | | | | | | | instead of just in Qt's install or build folder. Only do it if the path exists in the PySide package, and if it's not already on the search path. Change-Id: I5a8ec8724cad2cb011e7e1c364c82a8b87289c5c Reviewed-by: John Ehresman <jpe@wingware.com>
* Add explicit type conversion to fix mingw compile errorRoman Lacko2013-01-161-1/+1
| | | | | Change-Id: Id15e68fc34fd8fbb386794f04039a23766691cfe Reviewed-by: Hugo Parente Lima <hugo.lima@openbossa.org>
* 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>
* Fix reference leak on convertion from a C++ map type to Python dict.Hugo Parente Lima2012-09-111-3/+5
| | | | | | | Patch by Dennis Victorovich. Change-Id: I050da20f6c0bef2f568aefcc81a9a159a412be24 Reviewed-by: Hugo Parente Lima <hugo.lima@openbossa.org>
* Change the order of pysitetest and signals directories because ↵Hugo Parente Lima2012-08-281-1/+1
| | | | | | | signals/disconnect_test.py depends on pysidetest module. Change-Id: I31e9fa50cd36979b4843c8c12e3d0680dba2135e Reviewed-by: Marcelo Lira <marcelo.lira@openbossa.org>
* Version bump to 1.1.2Hugo Parente Lima2012-08-281-1/+1
| | | | | Change-Id: If67468b046da795ddf2253779f56b027a138b14e Reviewed-by: Hugo Parente Lima <hugo.lima@openbossa.org>
* During signal emission don't get return type after callbackJohn Ehresman2012-07-312-11/+39
| | | | | | | | | 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>
* Invalidate invisibleRootItem in clear() methodJohn Ehresman2012-07-313-2/+16
| | | | | | | Fixes PYSIDE-56 Change-Id: If0529a289e6d9613fdd85bd9d37ccf438d4e92ca Reviewed-by: Hugo Parente Lima <hugo.lima@openbossa.org>
* Optimize vector to pylist conversionJohn Cummings2012-06-142-6/+15
| | | | | | | | | | Incorporate changes from Shiboken change I5f0c93b7 Note switch to push_back() should allow the template to work for both QVector and std::vector. Likewise, using size_type should avoid compiler warnings. Change-Id: I4742aa9030e1bfa2e070f4b6f71d124d3c99749d Reviewed-by: Hugo Parente Lima <hugo.lima@openbossa.org>
* Add missing unit test.Hugo Parente Lima2012-06-141-0/+17
| | | | | Change-Id: Ia8442dd910c52a892767a49a339c63fec6fbf3c0 Reviewed-by: Marcelo Lira <marcelo.lira@openbossa.org>
* Fixed template name typoJohn Cummings2012-06-042-25/+25
| | | | | | | | | | Fixed typo of template names by changing "convertion" to "conversion" Fixed all usages of incorrect name Note that this change is not backwards compatible if using the misspelled names in user code. Change-Id: Ie34e0ef8cc23362c8efb2d6bf1ec9779d6e4c42b Reviewed-by: Hugo Parente Lima <hugo.lima@openbossa.org>
* Improved QVector to python conversionJohn Cummings2012-06-012-1/+10
| | | | | | | | | Added pyseq_to_cppvector_conversion template that calls reserve() with the sequence size to reduce memory reallocations Changed QVector conversion to use new the template Change-Id: I099ab15d5f725499218e2ed081a325246aa5b902 Reviewed-by: Hugo Parente Lima <hugo.lima@openbossa.org>
* Do not always try to remove bytecode version of the test.Hugo Parente Lima2012-05-042-7/+8
| | | | | | | | | | | Trying to remove the bytecode file doesn't work if it wasn't created in the first place. This can happen for example under Gentoo, where bytecode is disabled while building packages to avoid sandbox violations when Python tries to write a bytecode file for an already-installed module outside the package build directory. Change-Id: I4cbd63527479365e6f201d3fc51c576f55830680 Reviewed-by: Hugo Parente Lima <hugo.lima@openbossa.org>
* Fix bug 1041 - "QAbstractItemModel has wrong ownership policy for ↵Hugo Parente Lima2012-04-201-0/+7
| | | | | | | selectionModel()" Change-Id: I1dbe6d3cd69774dfa18f15d83794396f17b769f0 Reviewed-by: Hugo Parente Lima <hugo.lima@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>
* Add hash-function for QModelIndex and QPersistenModelIndexAlexander Jones2012-04-193-2/+47
| | | | | | Change-Id: I2725e78a1006fbee54894f202997e2e408998551 Task-number: PYSIDE-41 Reviewed-by: Hugo Parente Lima <hugo.lima@openbossa.org>
* Bug fix for PYSIDE-7Juhapekka Piiroinen2012-03-132-0/+24
| | | | | | | | This should resolve the issue in PYSIDE-7 "QDateTime does not support the 6-argument format". Added function signature for 6-argument version and a testcase. Change-Id: I617eefab6a41939c37e2f1bf800857bc2d74b6ee Reviewed-by: Hugo Parente Lima <hugo.lima@openbossa.org>
* Fix bug PYSIDE-6Juhapekka Piiroinen2012-03-131-1/+1
| | | | | | | | This should resolve the issue in PYSIDE-6 "Fix phonon VideoCaptureDevice detection to properly use phonon_ namespace". Changed if check in PySideModules.cmake. Change-Id: Ie30d6858a0fc6073560ec4cd09508504cbeb667d Reviewed-by: Hugo Parente Lima <hugo.lima@openbossa.org>
* Fix PySide compilation.Hugo Parente Lima2012-03-134-5/+4
| | | | | Change-Id: Ie7a30961232526af59cbc21dbf1b58ab9a4e3e7b Reviewed-by: Hugo Parente Lima <hugo.lima@openbossa.org>
* Version bump to 1.1.1.Marcelo Lira2012-03-081-1/+1
|
* Version bump to 1.1.0.ps-1.1.0Marcelo Lira2012-03-081-4/+4
|
* Declares Python types using the new "<custom-type>" tag.Marcelo Lira2012-03-081-0/+10
| | | | | Reviewed by Hugo Parente <hugo.lima@openbossa.org> Reviewed by Paulo Alcantara <pcacjr@gmail.com>
* Fix BUG #1060 - "Subclassing of QUiLoader leads to "Internal C++ objectPaulo Alcantara2012-03-084-5/+44
| | | | | | | | | already deleted" exception" See http://bugs.pyside.org/show_bug.cgi?id=1060. Signed-off-by: Paulo Alcantara <pcacjr@gmail.com> Reviewed-by: Marcelo Lira <marcelo.lira@openbossa.org>
* Fix BUG #1091 - "PixmapFragment and drawPixmapFragments are not bound"Paulo Alcantara2012-03-084-74/+100
| | | | | | | | | See http://bugs.pyside.org/show_bug.cgi?id=1091. Also minor coding style fixes in QtGui's typesystem. Signed-off-by: Paulo Alcantara <pcacjr@gmail.com> Reviewed-by: Marcelo Lira <marcelo.lira@openbossa.org>
* Fix BUG #1084 - "Crash (segfault) when writing unicode string on socket"Paulo Alcantara2012-03-083-13/+25
| | | | | | | See http://bugs.pyside.org/show_bug.cgi?id=1084. Signed-off-by: Paulo Alcantara <pcacjr@gmail.com> Reviewed-by: Trust me