summaryrefslogtreecommitdiffstats
path: root/src/tools
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-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
* | | | Add support for slots to receive the raw void ** arguments arrayLars Knoll2019-10-073-12/+22
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-067-6/+400
|\| | |
| * | | 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
| |/ /
* | | Merge remote-tracking branch 'origin/5.15' into devLiang Qi2019-10-041-106/+82
|\| |
| * | Android: Do not extract QML assets dataBogDan Vatra2019-10-021-97/+71
| * | Android: Fix plugins namingBogDan Vatra2019-10-011-9/+11
* | | Merge remote-tracking branch 'origin/wip/qt6' into devSimon Hausmann2019-09-183-11/+1
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/dev' into wip/qt6Alexandru Croitor2019-09-044-584/+576
| |\ \ \
| * | | | Kill all QPictureIOAllan Sandfeld Jensen2019-08-121-3/+0
| * | | | Merge remote-tracking branch 'origin/dev' into wip/qt6Lars Knoll2019-08-063-21/+24
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/dev' into wip/qt6Alexandru Croitor2019-07-0820-233/+316
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/dev' into wip/qt6Simon Hausmann2019-06-2618-339/+579
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/dev' into wip/qt6Alexandru Croitor2019-06-112-2/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/dev' into wip/qt6Alexandru Croitor2019-06-0611-142/+79
| |\ \ \ \ \ \ \ \
| * | | | | | | | | uic: Remove deprecated optionsKai Koehne2019-05-271-7/+0
* | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-09-061-1/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Android: Fix architecture extraction from file path in androiddeployqtAlexandru Croitor2019-09-031-1/+3