aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make quiet builds really quietv5.12.1v5.12.0Alexandru Croitor2018-11-291-0/+5
| | | | | | | | Make sure not to print "up-to-date" and "install" messages when doing a quiet build. Change-Id: Ie86853ea58aed3d35f37a9dd3e4c358269fbe111 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Exclude the ChangeLog generation target for Ninja on WindowsFriedemann Kleint2018-11-231-0/+3
| | | | | | | It generates an invalid command and won't work anyways. Change-Id: I1434f4e232690fe5f2bcfff41772c8e267f47304 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Add python wrapper to call native toolsSimo Fält2018-10-022-6/+61
| | | | | | | | | | | | To install command to path, we need a python script which can be used as an entry point in setup.py . This is sufficient. On Windows, setuptools takes care of creating executable files which are inserted into the "Scripts" folder. Task-number: PYSIDE-779 Change-Id: Ic81087e10dfd98af65dfe07a68f351fca9f8637a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devFriedemann Kleint2018-06-013-1/+387
|\ | | | | | | Change-Id: If97fb7a576cd3a21d9eb2a0f8674e4d231d8630e
| * Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.2v5.11.1v5.11.05.11.25.11.15.11.05.11Friedemann Kleint2018-06-013-1/+387
| |\ | | | | | | | | | Change-Id: Ifbeca4189d55b7b925a0ac501f462ca0be6eb61f
| | * qt_attribution file for pyside-tools5.9Cristian Maureira-Fredes2018-05-312-0/+383
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rcc and lupdate directories have GPL-2.0 as license, but since the Copyright headers differ there are separate entries per tool. uic has a double license BSD-3-clause and GPL-2.0, so it also has a different entry. Change-Id: Icee59de64dd41c1e49b2b2fd2216ef3ac5d87148 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * Add verification for buttonGroupCristian Maureira-Fredes2018-05-221-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Check if the buttonGroup attribute is already a string instead of trying to extract it. Task-number: PYSIDE-658 Change-Id: I0c5538736b06a8ba011b1a9f3a33c45a80713969 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | | Merge remote-tracking branch 'origin/5.11' into devFriedemann Kleint2018-04-202-3/+4
|\| | | | | | | | | | | Change-Id: I7e3013f2695036079ebb1acc60484ab7b7d62b3f
| * | Merge remote-tracking branch 'origin/5.9' into 5.11Friedemann Kleint2018-04-202-3/+4
|/| | | |/ | | | | Change-Id: I4b27e6c35b6411235e2f1faa0de8decbcf9a5fde
| * pyside2-uic: Mention form license in headerFriedemann Kleint2018-04-181-2/+3
| | | | | | | | | | | | Change-Id: Ib938f94e50b4f0843babd87f0a27ed60a412fcf5 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Bump minimum required CMake version to 3.1.0Alexandru Croitor2017-07-271-1/+1
| | | | | | | | | | Change-Id: I7b3215eb2df1f2fd1036de29569bafb8b2fff105 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Do not install man pages on windowsJulien Schueller2017-09-273-3/+3
| | | | | | | | | | | | Task-number: PYSIDE-565 Change-Id: Id0eb5bd3b8867c768c7fb9c28a61e217a1cc02ca Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Make pyside2-uic executable by windows shellJulien Schueller2017-09-271-0/+6
| | | | | | | | | | | | Task-number: PYSIDE-564 Change-Id: I326287dabe1c09a4474f10a5afdbcaefa36a4919 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | pyside2-rcc -help to return 0Julien Schueller2017-09-211-7/+10
|/ | | | | | | | | | This fixes pyside2-rcc -help to exit with return code 0 instead of 1 when there are no errors. Also fixes the return code of pyside2-rcc -version. Task-number: PYSIDE-562 Change-Id: I40c05f40f2ec257c3d9eeeb32699795ec8f1ddd0 Reviewed-by: Christian Tismer <tismer@stackless.com>
* fix bogus setMargin in pyside2-uicChristian Tismer2017-03-081-3/+5
| | | | | | | | | | | | | | | This bug has been reported five years ago. By inspecting uiparser.py, in function createLayout, an extra 'margin' element is added (~line 399) because the layout is child of a QWidget which is not the child of the main window. The code in that function checks if there are individual margin elements but fails in the case where there is a single 'margin' element, that is, when all margins are equal. If at least one margin is different then the problem doesn't appear. Task-number: PYSIDE-127 Change-Id: I557a12a15048c5c713badc44309e2bb2144a35a9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Adjust plugins to PySide2Christian Tismer2017-02-132-2/+2
| | | | | | | | | | The includes in pysideuic/widget-plugins needed to be updated. Probably, there should be some more plugins here, soon. The existing plugins are deprecated, but they should be correct. Task-number: PYSIDE-361 Change-Id: I1db14d31f3a2f21d9f5094b9b507f20edd3f1495 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix build with a namespaced build of QtFriedemann Kleint2017-01-122-2/+4
| | | | | | | Task-number: PYSIDE-431 Change-Id: I335cfac90df9eedf2455da6e2e197daa00e4913b Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* pyrcc: Default to Python 3Friedemann Kleint2016-09-191-4/+4
| | | | | | | | | Generate all data as byte literals to work on Python 2 and 3. Task-number: PYSIDE-328 Change-Id: I8b574bab378459e54b72792c528154ae8135b937 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix a problem with the font attributeChristian Tismer2016-05-122-2/+17
| | | | | | | | | | | | | | The transition from Qt4 to Qt5 introduced the QtWidgets module. By simply replacing the QtGui module, things like QFont were lost. Instead, both QtGui and QtWidgets needed to be supported. [ChangeLog][pyside2uic][PYSIDE-316] Fixed failing pyside-uic when parsing font properties. Task-number: PYSIDE-316 Change-Id: I377c0332d56ea4266e9363cfdb1746d5bf2c2b06 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Christian Tismer <tismer@stackless.com>
* Add option to link with libc++ on older OSX versions.Alexandru Croitor2016-05-111-0/+7
| | | | | Change-Id: I0e5b0486a03010386195e09702fbff72843ef28e Reviewed-by: Christian Tismer <tismer@stackless.com>
* Merge remote-tracking branch 'origin/master'Thomas-Karl Pietrowski2016-04-181-8/+18
|\
| * Fix generating of resource files (#6)Mateusz Skowroński2016-04-171-8/+18
| | | | | | | | | | | | | | * Format resource files similar to the C++ version. * Fix generating of resource files for Qt5. Use qt_hash() function instead of qHash() which guarantees the results will always be the same.
* | CMake: Exclude man file to be installed into SITE_PACKAGEThomas-Karl Pietrowski2016-04-181-0/+1
|/
* CMake: Move generated file into pyside2uicThomas-Karl Pietrowski2016-04-171-2/+2
| | | | ${CMAKE_CURRENT_BINARY_DIR}/__init__.py -> ${CMAKE_CURRENT_BINARY_DIR}/pyside2uic/__init__.py
* CMake: Generate __init__.py into BINARY_DIRThomas-Karl Pietrowski2016-04-171-1/+1
|
* Rename tools to show they are compatible with PySide2 and allow insta… (#4)Mateusz Skowroński2016-04-1646-111/+106
| | | | | | * Rename tools to show they are compatible with PySide2 and allow installation parallel to PySide1 tools. * Fix install target typo.
* Merge pull request #3 from ddinu/masterThomas Karl Pietrowski2016-04-038-94/+101
|\ | | | | Migrate pysideuic to Qt5.
| * Migrate pysideuic to Qt5.Florin Dinu2016-04-018-94/+101
|/
* no messageChristian Tismer2015-09-214-7/+7
|
* not-so-small fix to the huge change.Christian Tismer2015-09-212-3/+3
| | | | | | 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-211-2/+2
| | | | | | | | | | | 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 more resourcesChristian Tismer2015-09-201-0/+15
|
* Merge pull request #2 from IronManMark20/masterChristian Tismer2015-09-201-1/+1
|\ | | | | change for new name
| * change for new nameEthan2015-09-191-1/+1
| |
* | Merge pull request #1 from IronManMark20/masterChristian Tismer2015-09-192-4/+6
|\| | | | | change to md, add re-direct
| * change to md, add re-directEthan2015-09-192-4/+6
|/
* Merge commit 'a71b6d189fac12d24c201ba367aa6c6e5a802c13'Christian Tismer2015-09-170-0/+0
|\
| * improve the windows installer to handle backslash properlyChristian Tismer2015-08-161-4/+6
| |
* | simplify the repos by turning qt5 into master and ignoring qt4.Christian Tismer2015-09-171-4/+6
|/
* remove phonon pluginChristian Tismer2015-07-051-32/+0
|
* successfully adjusted to qt5Christian Tismer2015-06-106-39/+45
| | | | The most work was to adjust for the new languages in CLDR 22.1
* Create README.rstRoman Lacko2013-10-281-0/+4
|
* Bump the library version number to 0.2.15Roman Lacko2013-08-161-1/+1
|
* Fixed site-packages resolution on Linux with both python 3.x and 2.x installedRoman Lacko2013-08-011-3/+3
|
* Version bump to 0.2.14Hugo Parente Lima2012-04-271-1/+1
|
* Merge pull request #6 from lck/masterRoman Lacko2012-01-1615-47/+262
|\ | | | | rcc fixes and pysideuic py3k port. Original author Miroslav Jezek.
| * rcc - fix problem with non-utf8 characters in header + pysideuic - py3k ↵Roman Lacko2012-01-1015-47/+262
|/ | | | port. Original author Miroslav Jezek.
* Fix bug 1040 - "pyside-uic overwriting attributes before they are being used"Willer Moreira2011-12-141-5/+5
| | | | | Reviewed-by: Luciano Wolf <luciano.wolf@openbossa.org> Reviewed-by: Paulo Alcantara <pcacjr@gmail.com>
* Handle filenames that contain whitespaces properly.Paulo Alcantara2011-12-141-2/+30
| | | | | | | | | Fixes bug #1053. http://bugs.pyside.org/show_bug.cgi?id=1053 Signed-off-by: Paulo Alcantara <pcacjr@gmail.com> Reviewed-by: Luciano Wolf <luciano.wolf@openbossa.org> Reviewed-by: Marcelo Lira <marcelo.lira@openbossa.org>
* Version Bump.Renato Filho2011-08-221-2/+2
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 10:00:13 +0000