summaryrefslogtreecommitdiffstats
path: root/src/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-133-4/+5
|\
| * 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.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-048-25/+173
|\ \ \ | |/ /
| * | 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
| |/ /
* | | Basic QImage cleanupAllan Sandfeld Jensen2019-12-181-1/+0
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-093-3/+3
|\ \ \ | |/ /
| * | Tidy nullptr usageAllan Sandfeld Jensen2019-12-063-3/+3
* | | Change representation of string data in the meta objectLars Knoll2019-12-081-8/+5
* | | Use Q_NAMESPACE for the Qt namespace, and remove the old moc hack to support itOlivier Goffart2019-12-061-9/+2
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-291-1/+1
|\ \ \ | |/ /
| * | androidtestrunner: Fix warnings about missing parameter to QStringLiteralFriedemann Kleint2019-11-281-1/+1
* | | Moc Sort json file list in collectjsonLeander Beernaert2019-11-271-1/+3
* | | uic: Migrate from QList to QVectorFriedemann Kleint2019-11-264-62/+62
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-256-166/+178
|\ \ \ | |/ /
| * | 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
* | | Make QList an alias to QVectorLars Knoll2019-10-302-3/+1
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-273-20/+20
|\ \ \ | |/ /
| * | 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.15' into devQt Forward Merge Bot2019-10-262-2/+3
|\ \ \ | |/ /
| * | 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.15' into devQt Forward Merge Bot2019-10-171-0/+1
|\ \ \ | |/ /
| * | 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