summaryrefslogtreecommitdiffstats
path: root/src/tools/uic
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/dev' into merge-devLeander Beernaert2020-01-2413-237/+302
|\
| * Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-161-5/+23
| |\
| | * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-151-5/+23
| | |\
| | | * uic/Python: Fix missing QCursor importFriedemann Kleint2020-01-141-1/+1
| | | * uic: add customwidget imports support for pythonCristián Maureira-Fredes2020-01-141-4/+22
| * | | Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-01-077-13/+60
| |\| |
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-067-13/+60
| | |\|
| | | * uic: setWeight replace semi-colon by language::eolCristián Maureira-Fredes2020-01-051-1/+1
| | | * uic: Add handling of resources imports for PythonFriedemann Kleint2020-01-034-0/+40
| | | * uic: Add colon missing for "if()" constructs in PythonFriedemann Kleint2020-01-031-5/+10
| | | * uic: Fix empty strings for PythonFriedemann Kleint2020-01-033-7/+9
| * | | Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-01-041-2/+2
| |\| |
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-271-2/+2
| | |\|
| | | * uic: Rename raise() to raise_() for PythonCristián Maureira-Fredes2019-12-191-2/+2
| * | | Basic QImage cleanupAllan Sandfeld Jensen2019-12-181-1/+0
| * | | uic: Migrate from QList to QVectorFriedemann Kleint2019-11-264-62/+62
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-255-154/+155
| |\| |
| | * | uic: Update ui4.cpp/h sourcesFriedemann Kleint2019-11-142-147/+147
| | * | uic: Remove some usages of QListFriedemann Kleint2019-11-133-7/+8
| | |/
* | | Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2019-11-191-19/+19
|\| |
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-271-18/+18
| |\|
| | * uic: Add language::eol in more cases for python codeCristián Maureira-Fredes2019-10-251-18/+18
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-261-1/+1
| |\|
| | * Uic: fix crash when trying to resource icon informationChristian Ehrlicher2019-10-211-1/+1
* | | Regenerate src/*Alexandru Croitor2019-11-142-2/+2
* | | Regenerate everything under ./srcAlexandru Croitor2019-11-122-2/+0
* | | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-10-111-3/+0
|\| |
| * | Kill all QPictureIOAllan Sandfeld Jensen2019-08-121-3/+0
* | | Regenerate tools projectsAlexandru Croitor2019-10-082-8/+51
* | | Merge branch 'wip/qt6' into wip/cmakeAlexandru Croitor2019-08-151-2/+3
|\| |
| * | Merge remote-tracking branch 'origin/dev' into wip/qt6Lars Knoll2019-08-061-2/+3
| |\|
| | * uic: Avoid use of Q_UNUSED in the generated codehjk2019-07-301-2/+3
* | | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-07-1113-52/+67
|\| |
| * | Merge remote-tracking branch 'origin/dev' into wip/qt6Alexandru Croitor2019-07-088-19/+38
| |\|
| | * uic: Implement form window setting to disable QObject::connectSlotsByName()Friedemann Kleint2019-07-024-1/+20
| | * uic: Fix remaining clang warningsFriedemann Kleint2019-06-285-18/+13
| | * uic: Add option to disable the call to QObject::connectSlotsByName()Friedemann Kleint2019-06-281-0/+5
| * | Merge remote-tracking branch 'origin/dev' into wip/qt6Simon Hausmann2019-06-269-33/+29
| |\|
| | * uic: Fix some clang warningsFriedemann Kleint2019-06-064-12/+9
| | * uic: Replace 'typedef' by 'using'Friedemann Kleint2019-06-064-10/+10
| | * uic: Introduce nullptrFriedemann Kleint2019-06-115-11/+10
* | | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-06-142-8/+1
|\| |
| * | Merge remote-tracking branch 'origin/dev' into wip/qt6Alexandru Croitor2019-06-111-1/+1
| |\|
| | * Remove QLatin1Literal usagesGiuseppe D'Angelo2019-06-101-1/+1
| * | Merge remote-tracking branch 'origin/dev' into wip/qt6Alexandru Croitor2019-06-064-42/+52
| |\|
| * | uic: Remove deprecated optionsKai Koehne2019-05-271-7/+0
* | | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-06-035-51/+65
|\ \ \ | | |/ | |/|
| * | uic/Python: Fix tab stop/Z-Order and buddy handlingFriedemann Kleint2019-05-084-42/+52
| |/
| * uic/Python: Generate empty strings as "" instead of QString()Friedemann Kleint2019-05-081-2/+4
| * Deprecate conversion functions between QList and QSetLars Knoll2019-05-071-1/+1