aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into devHEADdevFriedemann Kleint2017-05-187-26/+52
|\ | | | | | | Change-Id: I8eeca2bbbf6662d0bdc9c3ef5f4018d9f4019159
| * Merge remote-tracking branch 'origin/5.6' into 5.9Friedemann Kleint2017-05-183-4/+4
| |\ | | | | | | | | | Change-Id: Ida4053330f436fa707689707d8a35734a836cd57
| | * Add flags for TouchPointStateFriedemann Kleint2017-05-181-1/+1
| | | | | | | | | | | | | | | | | | Task-number: PYSIDE-487 Change-Id: Ia89741685b2500cfcb83e1a7982dd52dc94e5fcc Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * Add QMacPasteboardMime and qRegisterDraggedTypes() to typesystemLiang Qi2017-05-132-3/+3
| | | | | | | | | | | | | | | | | | | | | Task-number: PYSIDE-487 Change-Id: I56b9138e8b368754ee07965479d6c8e795fc8206 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Adapt suppression pattern for parameter type warning to new formatFriedemann Kleint2017-05-181-1/+1
| | | | | | | | | | | | | | | Change-Id: Ibfe645aea0bdc9843bbc1e13cdabb04d2feb32e3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | Remove qmacstyle_mac.h and duplicate includes in global.h.in fileAlexandru Croitor2017-05-091-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmacstyle_mac.h sneaked in through a 5.6 -> 5.9 merge, which broke builds on macOS. Remove the include, as well as remove other duplicate includes which are now handled by the cmake global.h.in append mechanism. Change-Id: I333f897ff5f128f7b373ee03be6228915e5e5cd3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Fix PySide build using Qt frameworksAlexandru Croitor2017-05-093-11/+47
| | | | | | | | | | | | | | | | | | Change-Id: I37cae548c2ae451fa8672c9a54a19e929a831f25 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
* | | Merge remote-tracking branch 'origin/5.9' into devFriedemann Kleint2017-05-0929-582/+1158
|\| | | | | | | | | | | Change-Id: I5d7b278fab717c99a74d990d5b426120ee9c0c06
| * | Merge remote-tracking branch 'origin/5.6' into 5.9Friedemann Kleint2017-05-0929-582/+1158
| |\| | | | | | | | | | Change-Id: Id1c6fa0d1f05ba3e1bbe361a7e0bb20cd52a0a34
| | * Rewrite CMake scripts and generate includes for global.h.inChristian Tismer2017-05-094-322/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CMake files are repeating code three times, which should be avoided. Also, the global.h.in contained too many unconditional includes, which becomes relevant for the PySide 5.9 branch when missing includes are no longer ignored. Instead of maintaining an always growing list of conditionals (did that first), the needed includes are now computed by CMake, and the collected includes are appended to pyside2_global.h . Task-number: PYSIDE-507 Change-Id: I86f27d42c2d60d75ab4597e262e874c7186389c8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * Remove fixup_headers after fixing shiboken for C++11Christian Tismer2017-05-096-171/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hack for VS 2015 is replaced by a shiboken patch. This must be immediately applied after shiboken was fixed. Reason: The build would work, but Windows will not load because of missing symbols! Task-number: PYSIDE-504 Change-Id: I3ce8989632748b8967228a9993b11c599a858b91 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * QtGui/QRawFont: Exclude member functions with array parametersFriedemann Kleint2017-05-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warnings: qt.shiboken: There's no user provided way (conversion rule, argument removal, custom code, etc) to handle the primitive argument type 'const quint32 *' in function 'QRawFont::advancesForGlyphIndexes(const quint32 * glyphIndexes, QPointF * advances, int numGlyphs) const'. qt.shiboken: There's no user provided way (conversion rule, argument removal, custom code, etc) to handle the primitive argument type 'const QChar *' in function 'QRawFont::glyphIndexesForChars(const QChar * chars, int numChars, quint32 * glyphIndexes, int * numGlyphs) const'. ... Amends 2e9f955a086fa7676c9eda60ca9e28cc03d9c5e2. Task-number: PYSIDE-487 Change-Id: I5db3ef75d80dc478783730a1c640101f90d0b65a Reviewed-by: Christian Tismer <tismer@stackless.com>
| | * CMakeLists.txt: find python interpreter firstDavide Pesavento2017-05-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | CMake documentation recommends ordering find_package(PythonInterp) before find_package(PythonLibs) when both are called. Change-Id: Ic09f40b999d446146f58c1e6dab2ba920d8821a5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * Add support for Qt Mac Extras moduleLiang Qi2017-05-057-0/+158
| | | | | | | | | | | | | | | | | | | | | Task-number: PYSIDE-487 Change-Id: I26e4e2c443098b2309a1d3c954f7e80d16b86d81 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
| | * Add support for Qt Win Extras moduleLiang Qi2017-05-037-0/+172
| | | | | | | | | | | | | | | | | | Task-number: PYSIDE-487 Change-Id: Ie7cb4df3900fca36b0ef4747f351ab0600d8f45c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * QtGui: Add more non-GL related bindingsFriedemann Kleint2017-05-039-0/+278
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add: QBackingStore QEnterEvent QMarginsF QPageLayout QPageSize QPaintDeviceWindow QPixelFormat QPdfWriter QRasterWindow QRawFont QPaintDeviceWindow QStaticText QStyleHints Task-number: PYSIDE-487 Change-Id: I8926f55e4a5c71fc7e5b2293c4d300e305c6b56d Reviewed-by: Christian Tismer <tismer@stackless.com>
| | * QtMultimedia: Add further classesFriedemann Kleint2017-05-025-120/+482
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split typesystem_multimedia.xml into typesystem_multimedia_common.xml and typesystem_multimedia_forward_declarations.xml in order to be able to implement the overloads of QCamera::setViewfinder and QMediaPlayer::setVideoOutput() taking a QVideoWidget/ QGraphicsVideoItem, respectively. Task-number: PYSIDE-349 Task-number: PYSIDE-487 Change-Id: I4b8758f3715fbf12e9f05d48da18e0c65c17f06d Reviewed-by: Christian Tismer <tismer@stackless.com>
* | | Merge remote-tracking branch 'origin/5.9' into devFriedemann Kleint2017-05-0248-101/+998
|\| | | | | | | | | | | Change-Id: I7d2d0be168d55ffe9bf368f130d1407992be9d1c
| * | Merge remote-tracking branch 'origin/5.6' into 5.9Friedemann Kleint2017-04-2848-101/+998
| |\| | | | | | | | | | Change-Id: Ib03ec4e344de48d7b09b4589c04aca40c62c27f5
| | * Check that all modules load at leastChristian Tismer2017-04-2821-19/+419
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I copied the script from tests/qtconcurrent into all untested directories, to make sure that all modules have at least a test for importing. Two modules are left unsupported for now: QtWebEngine, QtDesigner Change-Id: Id719cd304e5a63d8896b9f4d14f937d36d22ac5e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * Support Gentoo’s minimalism: Optional ModulesChristian Tismer2017-04-287-80/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been reported that Gentoo is quite minimalistic and adheres strictly to Qt5’s definition of optional modules. Because I once used the Qt5 essential modules as the minimum requirement, the Gentoo maintainers had to always patch out makefiles This patch removes this restriction. But instead simply removing, I added an option “essential” to the ‘CHECK_PACKAGE_FOUND’ macro. When an essential module is omitted, the macro generates a warning that maybe not all tests are working. This way, we don’t have to check all tests at once for missing imports. Update: application_test now correctly moved. Explicit warning for essential modules. Corrections, tested with QtCore, only. Task-number: PYSIDE-502 Change-Id: I6e63c74c80173e0f4bcb5100458b37963f71e4f9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * ensure that QWebEngineView.findText existsChristian Tismer2017-04-283-1/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been reported that QWebEngineView.findText does not exist, and I could it verify on 2017-02-10 that it really doesn’t exist. Now, the situation seems to have changed. This test should prevend the function from vanishing again. Task-number: PYSIDE-474 Change-Id: I9407099d8e4aeef390d40d3913001b1121a125a3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * QtWidgets: Add QKeySequenceEdit, QOpenGLWidgetFriedemann Kleint2017-04-274-0/+53
| | | | | | | | | | | | | | | | | | Task-number: PYSIDE-487 Change-Id: I6e9d783c7ee33b4ac2538f0e9b7a4b54c055d2f9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * tests: add a test function for QUrl::path()Liang Qi2017-04-261-0/+4
| | | | | | | | | | | | | | | | | | Task-number: PYSIDE-338 Change-Id: Ie76a4187db17c7ea9232d2992e606135f188bc51 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * Make QtConcurrent work at leastChristian Tismer2017-04-253-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | For some reason, nobody checked if QtConcurrent really works. I added the missing class and added a test. Change-Id: I134697a9357424986c4a1e615f4038f9a61678ea Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * QtCore: Add some missing classes for I/OFriedemann Kleint2017-04-245-1/+60
| | | | | | | | | | | | | | | | | | | | | Add QStorageInfo, QSaveFile and QTemporaryDir. Change-Id: Ice72ed52c86f9d51ca5e60ac988abc3320a51f13 Reviewed-by: Christian Tismer <tismer@stackless.com>
| | * Add QtMultimediaWidgetsFriedemann Kleint2017-04-249-0/+181
| | | | | | | | | | | | | | | | | | | | | | | | Add module and a simple test that shows the widgets. Task-number: PYSIDE-349 Change-Id: I0abecaa7dad03fbb1910ac049a5aed250ed80d78 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | | Merge remote-tracking branch 'origin/5.9' into devFriedemann Kleint2017-04-285-48/+105
|\| | | | | | | | | | | Change-Id: Ib69b7af46e48558e9e67dde80fceeb0dcec1ca38
| * | tests: bring some tests back for QUrl and QUrlQueryLiang Qi2017-04-261-48/+43
| | | | | | | | | | | | | | | Change-Id: Ic86711953dd87120cfe66bd345559f05522b4e84 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | Add QUrlQuery to typesystemLiang Qi2017-04-264-0/+62
| | | | | | | | | | | | | | | | | | Task-number: PYSIDE-345 Change-Id: Idffe4b317f22775f0728c94ed802b34236a166a2 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | | Merge remote-tracking branch 'origin/5.9' into devFriedemann Kleint2017-04-217-8/+41
|\| | | | | | | | | | | Change-Id: I00aa7cabba812a405330b6fe82c5d8393767f4f5
| * | Merge remote-tracking branch 'origin/5.6' into 5.9Friedemann Kleint2017-04-217-8/+41
| |\| | | | | | | | | | Change-Id: I7906cfb72af65bea9f46a0684562ffaaa273bab2
| | * Fix warnings when generating bindings for QtXmlPatternsFriedemann Kleint2017-04-201-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the typedefs and fix the signatures. Fixes: signature 'QXmlName(short,short,short)' for function modification in 'QXmlName' not found. Possible candidates: QXmlName() in QXmlName, QXmlName(QXmlNamePool&,QString,QString,QString) in QXmlName, QXmlName(QXmlName) in QXmlName signature 'setNamespaceURI(short)' for function modification in 'QXmlName' not found. Possible candidates: signature 'localName()const' for function modification in 'QXmlName' not found. Possible candidates: localName(QXmlNamePool)const in QXmlName signature 'prefix()const' for function modification in 'QXmlName' not found. Possible candidates: prefix(QXmlNamePool)const in QXmlName signature 'setPrefix(short)' for function modification in 'QXmlName' not found. Possible candidates: signature 'setLocalName(short)' for function modification in 'QXmlName' not found. Possible candidates: signature 'namespaceForPrefix(short)const' for function modification in 'QXmlNodeModelIndex' not found. Possible candidates: Change-Id: I8736feb0b19208e7d4fb1c0c9d8050b3f3ae697e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * Update Qt enumerations in XML filesFriedemann Kleint2017-04-206-3/+33
| | | | | | | | | | | | | | | | | | | | | Silence most warnings about unknown enumerations in Qt up to 5.10. Change-Id: If6be55d17e032b08bd2d4538d409020934ba051a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | | Merge remote-tracking branch 'origin/5.9' into devFriedemann Kleint2017-04-1310-41/+318
|\| | | | | | | | | | | Change-Id: I82cae0c91e66eb4bfcb635751b5fee797442dbf2
| * | Merge remote-tracking branch 'origin/5.6' into 5.9Friedemann Kleint2017-04-1310-41/+318
|/| | | |/ | | | | Change-Id: I32ea0fba55ef1edeaefbea2b97a4ee7eb5b19dc8
| * Add QCommandLineParser and QCommandLineOption to typesystemLiang Qi2017-04-134-0/+62
| | | | | | | | | | | | Task-number: PYSIDE-487 Change-Id: Icb420b12aab87b3a96997d719d777805ac640f34 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Fix Inheritance of PySideChristian Tismer2017-04-132-1/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are the tests for the newly inherited functions. By writing the tests, four new bugs have been found! This told me that it is necessary to write a simple script that systematically probes every generated function for basic functionality. PySide2.QtPrintSupport.QPrintPreviewDialog().open() prints a newline. Why is that? Task-number: PYSIDE-331 Change-Id: Ib6780884dfb10cf43a36006c6cabef60b1e1750f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Fix qstandarditemmodel_test.py not finding shiboken on macOSAlexandru Croitor2017-04-112-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running make test inside the build folder of PySide2, the mentioned test failed because it couldn't find shiboken2. Make sure to import the module as standalone, so the test succeeds. Also make sure to specify the proper python paths, by computing the paths to shiboken and pysidetest from the pyside build root path, rather than from pysidetest build path, because on some CMake implementations it evaluates to an empty path (probably due to the fact that ${pysidetest_BINARY_DIR} is evaluated before the pysidetest project is actually added). Change-Id: Ibe86b0d7c2c66db708bba2ffc32b02e5c3e91c79 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Fix Python extension suffix selection on LinuxAlexandru Croitor2017-04-112-34/+67
| | | | | | | | | | | | | | | | | | | | | | | | This allows building PySide in any configuration (debug or release) against any version of a Python interpreter (debug or release). Previously specifying --debug forced the user to use a debug version of the Python interpreter. Change-Id: Ieafcd250facd8cd231f6371882cc506496e75623 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Fix license headers in doc snippetsFriedemann Kleint2017-04-0536-108/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix errors introduced caused by a mass update 388fd6f2456b0db9a08c9dc04516de1970d7787d: WARNING: Switching to from BSD to BSD-OLD license due to: Mismatch in license text in sources/pyside2/doc/codesnippets/doc/src/snippets/alphachannel.cpp Actual: ' # Redistributions of source code must retain the above copyright' Expected: ' * Redistributions of source code must retain the above copyright' License: BSD (.../qtbase/header.BSD:16) at tests/prebuild/license/tst_licenses.pl line 449. Task-number: PYSIDE-491 Change-Id: Ia5b6df4650f8521c15b4b18829b556d7aa134290 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Adapt to Clang parsingFriedemann Kleint2017-04-053-8/+10
| | | | | | | | | | | | Task-number: PYSIDE-323 Change-Id: I36fa9b2b4890168693296e24b55526b7f250db10 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | PySide2/global.h.in: Clean out most Qt-specific macrosFriedemann Kleint2017-04-051-348/+11
|/ | | | | | | | | | This is no longer required for Clang. Add a definition for QT_ANNOTATE_ACCESS_SPECIFIER so that signals, slots become visible to Clang. Task-number: PYSIDE-323 Change-Id: I11e49c52e8f9b9ad5407af90044e48a8863f7832 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix build QML private API headers are missingAlexandru Croitor2017-03-272-0/+4
| | | | | | | | | | | | The QML / Quick item registration code depended on the presence of the PYSIDE_QML_SUPPORT define being set, which is set only when the build system finds the QML private API headers. Make sure to use PYSIDE_QML_SUPPORT in all the relevant places. Task-number: PYSIDE-489 Change-Id: I804395bcb10f1b6827f13bd92ec764dc861c544e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix simple test case for Python3 (2)Christian Tismer2017-03-251-1/+3
| | | | | | | | This test was still using print. The last of these errors, I should have seen it earlier. Change-Id: I147ae56f3e8e8b2446c6398d325e5661525ac7dc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix simple test case for Python3Christian Tismer2017-03-241-1/+3
| | | | | | | | This test was still using print. Change-Id: I121d5b1b8895f7361862e6888a12534e941b458e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix connectNotify testsAlexandru Croitor2017-03-222-5/+11
| | | | | | | | | The connectNotify signal does not get strings as argument anymore, but rather QMetaMethod values. Thus the tests should compare agains the methodSignatures of those QMetaMethods. Change-Id: I21c236514b408f08481f1c31ee2b2e2c4aed4be8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix qscriptvalue_test.pyAlexandru Croitor2017-03-221-0/+4
| | | | | | | | The test executed an eval() statement, which tried to access a non-imported module object. Change-Id: Ib4c9ca03ef62a62ac10bf89b085ea11b8a1a94cd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Partially fix QtScriptTools/debugger_test.pyAlexandru Croitor2017-03-223-4/+13
| | | | | | | | | | | | The generated module library did not include all necessary dependent libraries (QtWdigets), which caused symbols not to be found on module import. The test still fails for now, due to an issue in QtScriptTools module itself, specifically continue an interrupted evaluation does not work. Change-Id: I5439509a3541674fed6113d1ed73135497fc7d2a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix QtMultimedia_audio testAlexandru Croitor2017-03-221-4/+4
| | | | | | | | The test was using some deprecated methods from Qt4. Fix is to use the Qt5 equivalent methods. Change-Id: Ia33747105880aa0858a37e325bc250dc598a61a3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>