summaryrefslogtreecommitdiffstats
path: root/src/tools
Commit message (Expand)AuthorAgeFilesLines
* 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.14' into 5.15Liang Qi2020-01-093-4/+5
|\ \ | |/
| * Bump copyright yearJani Heikkinen2020-01-092-4/+4
| * AAB files can be signed only with jarsigner toolBogDan Vatra2020-01-091-0/+1
* | 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.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
* | Teach moc to output a Make-style depfileAlexandru Croitor2019-12-173-0/+133
* | Mark the old style unprefixed stream functions deprecatedAllan Sandfeld Jensen2019-12-161-1/+1
* | moc: change QMap::unite to QMap::insertMårten Nordheim2019-12-121-2/+2
* | Use a QMultiHash explicitly if insertMulti() is being usedLars Knoll2019-12-122-4/+4
* | Support Q_GADGET QMetaObject super class hierarchies across templatesMilian Wolff2019-12-121-1/+3
* | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-12-122-16/+23
|\ \
| * \ Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-122-16/+23
| |\ \ | | |/
| | * Support both qrc and qml files for qmlimportscannerMichael Dippold2019-12-111-9/+10
| | * rcc: Fix namespace handling for initializerSamuel Gaist2019-12-101-7/+13
* | | Split cborstream feature in twoUlf Hermann2019-12-121-0/+6
|/ /
* | Tidy nullptr usageAllan Sandfeld Jensen2019-12-063-3/+3
* | androidtestrunner: Fix warnings about missing parameter to QStringLiteralFriedemann Kleint2019-11-281-1/+1
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-151-12/+23
|\ \ | |/
| * Add support for passing qrc files to qmlimportscannerAndy Shaw2019-11-131-12/+23
* | 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/5.14' into 5.15Qt Forward Merge Bot2019-10-263-20/+20
|\ \ | |/
| * uic: Add language::eol in more cases for python codeCristián Maureira-Fredes2019-10-251-18/+18
| * Fix typoBogDan Vatra2019-10-251-1/+1
| * Fix bundled_libs section from libs.xmlBogDan Vatra2019-10-251-1/+1
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-221-1/+1
|\ \ | |/
| * Uic: fix crash when trying to resource icon informationChristian Ehrlicher2019-10-211-1/+1
* | Reimplement JSON support on top of CborUlf Hermann2019-10-211-1/+2
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-161-0/+1
|\ \ | |/
| * Win32: Consolidate registry codeFriedemann Kleint2019-10-141-0/+1
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-131-0/+1
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.13' into 5.14Liang Qi2019-10-101-0/+1
| |\
| | * Fix compile with tracing enabled: include QStringList headerMilian Wolff2019-10-091-0/+1
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-051-0/+1
|\ \ \ | |/ /
| * | Include likely-adjusted uiLanguages for the system localeEdward Welbourne2019-10-041-0/+1
* | | Add support for machine-readable JSON output to the MOCSimon Hausmann2019-10-046-6/+399
|/ /
* | Android: Do not extract QML assets dataBogDan Vatra2019-10-021-97/+71
* | Android: Fix plugins namingBogDan Vatra2019-10-011-9/+11
* | Android: Fix architecture extraction from file path in androiddeployqtAlexandru Croitor2019-09-031-1/+3
* | Add support for aabBogDan Vatra2019-09-021-42/+71
* | Use QLatin1String where possibleBogDan Vatra2019-08-281-115/+114
* | Merge remote-tracking branch 'origin/dev' into 5.14Liang Qi2019-08-272-496/+430
|\ \