aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Shiboken: Improve debug operators of the type systemFriedemann Kleint2017-07-114-3/+74
| | | | | | | | | | | | | | | | | | | | | | - Add debug operator for TypeParser::Info - Add verbose mode to AbstractMetaType - Output more information for TypeEntry Task-number: PYSIDE-354 Task-number: PYSIDE-516 Change-Id: Id9882e89f9b5a51929f27b100d28396d3f6c4198 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.9Friedemann Kleint2017-07-1027-490/+30
|\| | | | | | | Change-Id: I9d55ec493763dc9536d7926d428aecf75c10a72d
| * Simplify the test for loading modulesChristian Tismer2017-07-1026-489/+27
| | | | | | | | | | | | | | | | | | | | Some time ago, I added the test file that makes sure that all modules can load. This file needed to repeat for each module without any other tests. Now we have a real "PySide2.__all__" variable, and we can remove these tests in favor of one simple test. Change-Id: I96d91e749c134f30afc30751abb874ede2639d10 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Create the __all__ variable correctlyChristian Tismer2017-06-271-1/+3
| | | | | | | | | | | | | | | | | | | | Now that we have the cmake variable "all_module_shortnames", it is very straightforward to produce a sensible __all__ variable in the PySide2 module. This is necessary to write an exhaustive test script for the new signature feature. Change-Id: Ib43d647593f0b1b848b9d17ff27fd47cfb5832cb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Shiboken: Set C++ 11 globallyFriedemann Kleint2017-06-283-3/+1
| | | | | | | | | | Change-Id: I17634ebc245cae87819af16d79704326905e5783 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | [Reland] Add QSharedPointer<QQuickItemGrabResult> to the type systemAlexandru Croitor2017-06-275-0/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add test to check that calling QQuickItem::grabToImage() works correctly. The QSharedPointer type is added in the QtQuick typesystem file and not in QtCore to minimize the surface of issues that might come up, as well as because that's the only reasonable use case of QSharedPointer in the public API so far. The commit was missing in 5.9 branch after repo merge. Task-number: PYSIDE-454 Change-Id: Ibb7775117ffb22ab91d2ac798ae13cc9e4856587 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | [Reland] Fix crash on exit with debug Python 3Alexandru Croitor2017-06-271-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Crash happens because of an use-after-free error. This is a bandaid fix transforming the crash into a memory leak. Proper fix will require more investigation and time. The commit was missing in 5.9 branch after repo merge. Task-number: PYSIDE-488 Change-Id: I56358573ca60d6f18fd85fbd7eb3eb0da8fbf163 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.9Friedemann Kleint2017-06-237-22/+24
|\| | | | | | | Change-Id: Ieeaa4659753416315a619d0b683a3e5a4c8ed54e
| * Fix text case of QtMacExtras wrapper cpp file nameAlexandru Croitor2017-06-231-1/+1
| | | | | | | | | | | | | | | | | | This is probably the reason for the build failures in the CI because the filesystem there is case sensitive. Change-Id: I9f3cafbc8f1d29a0974229d466fbd22ec2b91491 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Silence some build warnings when building pysidetestAlexandru Croitor2017-06-231-0/+3
| | | | | | | | | | | | Change-Id: I91a1c87e6153a65a6e4088a41fbe0f696c2dd058 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Remove incorrect dependency in pysidetest targetAlexandru Croitor2017-06-232-1/+4
| | | | | | | | | | | | | | | | | | | | | | Even though the final library name is libpyside, the actual target that generates that file is called pyside2, as indicated by the project(pyside2) command in the CMakeLists.txt file. Also set the CMake policy of not ignoring incorrect dependencies. Change-Id: Iba65dfd5fe7e34e7557c756a838017fe48f0ffd5 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Remove unnecessary conditional class checksAlexandru Croitor2017-06-231-13/+0
| | | | | | | | | | | | | | | | | | The printing classes were moved to QtPrintSupport module, and the remaining classes are always present in their respective modules. Change-Id: I2e0ec061efc28c89f0476829541a7d2d3f01877f Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Fix compile tests to include correct module include dirsAlexandru Croitor2017-06-233-17/+18
| | | | | | | | | | | | | | | | | | Also include the optional QtNetwork sources, so that QSsl* class bindings are properly generated. Thus the optional QtWidgets and QtNetwork classes should be picked up. Change-Id: Id4d21dc577f2b551dce83999be76cdfd9d0b88d2 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * Fix testrunner.py in winSimo Fält2017-06-211-1/+9
| | | | | | | | | | | | | | | | The official git setup recommends to add only git.cmd to win PATH if ran in native CMD. Change-Id: I370752bf0d052f8047e929639b3246b726131b5a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | [Reland] Fix build error when QML module is not presentAlexandru Croitor2017-06-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The QML private API variable should be defined even when no QML module was found, because it is used for substitutions in signalmanager.cpp.in. This commit got lost for some unknown reason during the repository merge. Change-Id: I46dd1605d10b12836ea35441fccf6ef68a22925e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Change parsing to #include the source headerFriedemann Kleint2017-06-191-15/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | shiboken is normally run on a global header that includes all classes to be wrapped. However, when passing a header that contains the class declaration, it happens that the temporary copy of the header (being the location of the class declaration) is stored as required #include by the generators. Fix by using #include instead, so that the original header from the command line is seen as location. Task-number: PYSIDE-526 Change-Id: Ie30a8a2b21606c9f6ed5dda3447885576fdc4c2c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | shiboken: Further refactor command line arguments and helpFriedemann Kleint2017-06-099-83/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the QMap of options returned by the generators by a vector of pairs to allow for specifying the order. This allows for better formatting -I/-F/-T in multiple lines. Add -h for help. Move the missing typelib file handling into main and print a help hint there. Change-Id: I5a95bd8d193be012aaa7ce3934945b25e21d3f79 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.6' into 5.9" into 5.9Friedemann Kleint2017-06-0910-31/+73
|\ \
| * | Merge remote-tracking branch 'origin/5.6' into 5.9Friedemann Kleint2017-06-0910-31/+73
| |\| | | | | | | | | | Change-Id: I73f39966a2af7aa935e1890e29c9b71573aae97c
| | * utils: Handle SymlinksFriedemann Kleint2017-06-092-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | Try to recreate the .so version symlinks correctly on Linux instead of copying the files. Task-number: PYSIDE-526 Change-Id: I3b015efe4f2f57abe418f171a8631d194ed08f65 Reviewed-by: Christian Tismer <tismer@stackless.com>
| | * Fix missing headers in PySide custom buildChristian Tismer2017-06-092-18/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PySide itself built fine after the additional includes were added for inheritance. But when a smaller project is built, suddenly header files are not found, because the inherited names are not expected by the deployment. Therefore, we do no longer add more includes, but insert recursive headers for the few relevant cases. So the includes become a little longer, but the names of the include files are those as before the enhanced inheritance. Task-number: PYSIDE-500 Change-Id: Iab456307a3c2365dfe1964dbe222b7d0efac7878 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * libshiboken: Fix/Silence some MSVC warningsFriedemann Kleint2017-06-096-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | autodecref.h(110): warning C4522: 'Shiboken::AutoDecRef': multiple assignment operators specified autodecref.h(78): warning C4800: 'PyObject *const ': forcing value to bool 'true' or 'false' (performance warning) conversions.h(282): warning C4800: 'long': forcing value to bool 'true' or 'false' (performance warning) basewrapper.cpp(625): warning C4800: 'int': forcing value to bool 'true' or 'false' (performance warning) basewrapper.cpp(654): warning C4800: 'SpecialCastFunction': forcing value to bool 'true' or 'false' (performance warning) basewrapper.cpp(1014): warning C4800: 'Shiboken::ParentInfo *': forcing value to bool 'true' or 'false' (performance warning) basewrapper.cpp(1044): warning C4800: 'void *': forcing value to bool 'true' or 'false' (performance warning) helper.cpp(56): warning C4244: 'initializing': conversion from 'Py_ssize_t' to 'int', possible loss of data shibokenbuffer.cpp(46): warning C4800: 'int': forcing value to bool 'true' or 'false' (performance warning) Change-Id: If1517fde8e7670f258a56f6d845a66ebb3d82141 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | | Port the suppression mechanism to use QRegularExpressionFriedemann Kleint2017-06-093-24/+54
|/ / | | | | | | | | Change-Id: I686308207c03de2216cd6a5143b2c66f3014a896 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | shiboken2: Refactor path argument handlingFriedemann Kleint2017-06-071-21/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, shiboken2 accepted path arguments of the format --option=path1;path2 using the native OS separator character. This poses a problem when writing cross-platform .pro files for applications. Refactor the code to allow for the options to occur multiple times on the command line and introduce short-hand options -I, -F, -T for includes, framework includes and type system paths to reduce command line length. Task-number: PYSIDE-526 Change-Id: Ice540cbffeb01841988a99fdeb84bb7ba969ed79 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | testrunner.py/Windows: Add Clang to the pathFriedemann Kleint2017-06-063-17/+32
| | | | | | | | | | | | | | | | | | | | | | It is required for shiboken's ApiExtractor tests. Move subroutine detectClang into utils.py for usage by testrunner.py/setup.py. Task-number: PYSIDE-431 Change-Id: I9f1984ea9fc9857ad3e7fddf621884fdc96ef52f Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.9Friedemann Kleint2017-06-0236-6420/+53
|\| | | | | | | Change-Id: Ia6485d1b1caa93c4ecdd02b0544f19d197a43fb0
| * pysidetest_delegatecreateseditor_test: Add QtWidgets dependencyFriedemann Kleint2017-06-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | The test was failing since the method TestView::setItemDelegate(QAbstractItemDelegate *) was rejected due to QAbstractItemDelegate being unknown. Fix by adding the dependency to QtWidgets. Task-number: PYSIDE-431 Change-Id: I65c3690eccfdd55b310f45d65a2b0d8c32bedd36 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * Remove README.md of PySide2/Shiboken2Friedemann Kleint2017-06-022-29/+0
| | | | | | | | | | | | | | | | They contain outdated links and are no longer required after the repository merge. Change-Id: I6867435bcd1bbe53308dea1d9d8c1ba1a0fc0584 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * Fix .so filter for LinuxFriedemann Kleint2017-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | Previously, libpyside.so would not match .so.* and so, the libraries were not copied. Task-number: PYSIDE-526 Change-Id: I407db564beaee1f443dc7b816bc0bf798c8aacf1 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * Remove license files from previous submodulesFriedemann Kleint2017-06-0213-6338/+0
| | | | | | | | | | | | Task-number: PYSIDE-431 Change-Id: I35594dbf7dc6430ab5d0a2d235303f2bb7bd3677 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * libpyside: Use Q_SLOTS instead of slotsFriedemann Kleint2017-06-022-2/+2
| | | | | | | | | | | | | | | | | | When mixing Python and C++, Qt needs to be used with 'CONFIG += no_keywords' to suppress the 'slots' macro definition, which clashes with a Python header. Task-number: PYSIDE-526 Change-Id: I4feeae2de21db712b4de6653e243d556623436a1 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * Fix typos in licensesFriedemann Kleint2017-05-3016-48/+48
| | | | | | | | | | Change-Id: I781418f8747d51a0d329c0562e076600989b3768 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Update README.mdFriedemann Kleint2017-06-021-6/+4
| | | | | | | | | | | | | | | | | | LLVM_INSTALL_DIR is now preferred. Also, adding it to the path is no longer required on Windows. Change-Id: Ibc1a12042845563a2e776dc5cc03525206189a58 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Fix QtWebEngineWidgets to build with Qt 5.8/Qt 5.9Christian Tismer2017-05-291-2/+2
| | | | | | | | | | | | | | | | | | | | There is an old error in QtWebEngineWidgets which was never detected before we switched to the new parser. QWebEngineHistoryItem is an object-type, not a value-type. Change-Id: Id8ce323129985f4ab08cf3b81a15e3a9690649ad Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Fix TextToSpeech versionChristian Tismer2017-05-291-3/+3
| | | | | | | | | | | | | | | | The version must be since 5.8, not 5.9. Found because I build with homebrew Qt 5.8 Change-Id: I53b5235000ce6fb8dfea75224ca2a05daed826b4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Add QtChartsFriedemann Kleint2017-05-297-0/+296
| | | | | | | | | | | | Task-number: PYSIDE-487 Change-Id: I742d0fe52da22a06ca04069b6e0094d1913cc187 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Remove AbstractMetaFunction::invalid()Friedemann Kleint2017-05-295-32/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change AbstractMetaBuilderPrivate::traverseFunction() to consistently return 0 if something does not fit. Previously, functions with half-parsed arguments with the invalid flag set were returned. This caused strange side effects since the flag was not checked in all places. The only relevant information is whether some constructors were rejected. In that case, no default constructors or default copy constructors should be generated. This is now determined by checking the code model function item; the attribute HasRejectConstructor is introduced for this. This fixes: - Make it possible to reject the QTextStreamManipulator constructor taking a function pointer without having a default constructor generated: typedef void (QTextStream::*QTSMFI)(int); QTextStreamManipulator(QTSMFI m, int a) Q_DECL_NOTHROW - Implement QtCharts whose class QAbstractSeries has a rejected constructor. Change-Id: I6310574ba677dac20699f257340d2c2a55674353 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Use information about Constructor/Destructor functions from ClangFriedemann Kleint2017-05-293-53/+82
| | | | | | | | | | | | | | Expand CodeModel::FunctionType accordingly. Change-Id: I2759f45e4c60f36d4583b1c475c4c2df1e00ace6 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.9Friedemann Kleint2017-05-234-11/+155
|\| | | | | | | Change-Id: Iae075ebf8614dd016166bcb5f105f695e7dc3de2
| * setup.py/prepare_coin_sources.py: Adapt to repository mergeFriedemann Kleint2017-05-232-9/+7
| | | | | | | | | | | | | | | | Remove the former submodules pyside2/shiboken2 from the modules lists. Change-Id: I41de78f5519c24cce1e649eaf3b2f2d1cabcc9b0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| *-. Merge pyside2 and shiboken2 into super-moduleOswald Buddenhagen2017-05-222207-0/+251698
| |\ \
| | | * move everying into sources/shiboken2Oswald Buddenhagen2017-05-22653-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | in preparation for a subtree merge. this should not be necessary to do in a separate commit, but git is a tad stupid about following history correctly without it.
| | | * Fix crash on exit with debug Python 3Alexandru Croitor2017-05-191-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Crash happens because of an use-after-free error. This is a bandaid fix transforming the crash into a memory leak. Proper fix will require more investigation and time. Task-number: PYSIDE-488 Change-Id: I56358573ca60d6f18fd85fbd7eb3eb0da8fbf163 Reviewed-by: Christian Tismer <tismer@stackless.com>
| | * | move everying into sources/pyside2Oswald Buddenhagen2017-05-221554-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | in preparation for a subtree merge. this should not be necessary to do in a separate commit, but git is a tad stupid about following history correctly without it.
| | * | Fix build error when QML module is not presentAlexandru Croitor2017-05-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QML private API variable should be defined even when no QML module was found, because it is used for substitutions in signalmanager.cpp.in. Change-Id: I46dd1605d10b12836ea35441fccf6ef68a22925e Reviewed-by: Christian Tismer <tismer@stackless.com>
| | * | Add QSharedPointer<QQuickItemGrabResult> to the type systemAlexandru Croitor2017-05-195-0/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add test to check that calling QQuickItem::grabToImage() works correctly. The QSharedPointer type is added in the QtQuick typesystem file and not in QtCore to minimize the surface of issues that might come up, as well as because that's the only reasonable use case of QSharedPointer in the public API so far. Task-number: PYSIDE-454 Change-Id: Ibb7775117ffb22ab91d2ac798ae13cc9e4856587 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | | remove pyside2 and shiboken2 submodulesOswald Buddenhagen2017-05-223-46/+0
| | | | | | | | | | | | | | | | to be replaced by a subtree merge.
| | | |
| \ \ \
*-. \ \ \ Merge pyside2 and shiboken2 into super-module (5.9 edition)Oswald Buddenhagen2017-05-222157-0/+236836
|\ \ \ \ \
| | * | | | move everying into sources/shiboken2 (5.9 edition)Oswald Buddenhagen2017-05-22599-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in preparation for a subtree merge. this should not be necessary to do in a separate commit, but git is a tad stupid about following history correctly without it.
| | * | | | Fix double inclusion of qsharedpointer_impl.h fileAlexandru Croitor2017-05-191-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a workaround to allow building QSharedPointer bindings with the clang parser. In the previous parser the Q_QDOC define was set, and thus the implementation header was never included. When clang is queried to return the file which implements QSharedPointer, it will return the innermost header file. Because the header doesn't have header guards, the build will fail with redefinition errors. Task-number: PYSIDE-454 Change-Id: I5628fe2bafe528e11076f344b18b463db90c5651 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 04:21:58 +0000