summaryrefslogtreecommitdiffstats
path: root/src/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-02-133-7/+8
|\
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-121-1/+2
| |\
| | * Set also ndk.dirBogDan Vatra2020-02-111-1/+2
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-081-4/+4
| |\|
| | * uic/Python: Add imports for Q(Date)Time, QKeySequenceFriedemann Kleint2020-02-061-4/+4
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-061-1/+1
| |\|
| | * uic/Python: Set form object name correctlyFriedemann Kleint2020-02-051-1/+1
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-291-1/+1
| |\|
| | * Android: Respect the --no-build option for APK packagesAndy Shaw2020-01-181-1/+1
* | | Merge remote-tracking branch 'origin/wip/cmake' into devAlexandru Croitor2020-02-104-16/+8
|\ \ \
| * | | Regenerate projects to correctly handle private dependenciesAlexandru Croitor2020-02-054-16/+8
* | | | moc: Extend revision markers to allow for major and minor versionUlf Hermann2020-02-072-36/+54
* | | | Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev"Alexandru Croitor2020-02-0725-4/+1501
|\| | |
| * | | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-01-295-4/+11
| |\ \ \
| * | | | Add initial support for CMake "Ninja Multi-Config" generatorAlexandru Croitor2020-01-271-1/+11
| * | | | Post Merge FixesLeander Beernaert2020-01-242-0/+10
| * | | | Merge remote-tracking branch 'origin/dev' into merge-devLeander Beernaert2020-01-2429-290/+542
| |\ \ \ \
| * | | | | Remove invalid conversion and make it clearer for the futureLeander Beernaert2020-01-141-28/+28
| * | | | | Regenerate src/Leander Beernaert2020-01-144-6/+31
| * | | | | CMake: Add support for framework buildsJoerg Bornemann2020-01-061-2/+2
| * | | | | Collect Json Metatypes from CMake's AutomocLeander Beernaert2019-12-042-0/+407
| * | | | | Post merge fixesLeander Beernaert2019-11-252-4/+4
| * | | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2019-11-195-25/+24
| |\ \ \ \ \
| * | | | | | Regenerate src/*Alexandru Croitor2019-11-1421-48/+48
| * | | | | | Regenerate everything under ./srcAlexandru Croitor2019-11-1221-21/+0
| * | | | | | Regenerate a bunch of projects after pro2cmake changesAlexandru Croitor2019-11-124-2/+6
| * | | | | | Add --skip-install-root option to androidtestrunnerLeander Beernaert2019-10-241-4/+15
| * | | | | | Add Android test runner toolLeander Beernaert2019-10-232-0/+29
| * | | | | | Re-generate affected cmake files and configure.json after the mergeSimon Hausmann2019-10-172-0/+2
| * | | | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeSimon Hausmann2019-10-171-0/+1
| |\ \ \ \ \ \
| * | | | | | | Regenerate files after dev -> wip/cmake mergeAlexandru Croitor2019-10-146-0/+6
| * | | | | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-10-149-121/+503
| |\ \ \ \ \ \ \
| * | | | | | | | Regenerate qtbase after wip/qt6 -> wip/cmake mergeAlexandru Croitor2019-10-142-0/+6
| * | | | | | | | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-10-115-587/+576
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Regenerate tools projectsAlexandru Croitor2019-10-0814-24/+273
| * | | | | | | | | Clean up tinycbor handlingSimon Hausmann2019-10-084-7/+90
| * | | | | | | | | Regenerate qmake and bootstrap projectsAlexandru Croitor2019-10-071-4/+4
| * | | | | | | | | Merge branch 'wip/qt6' into wip/cmakeAlexandru Croitor2019-08-155-67/+64
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-07-1134-590/+920
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-06-147-14/+26
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Android: SDK SupportLeander Beernaert2019-06-052-0/+32
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-06-0325-473/+623
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Rerun pro2cmake on projects that use .ui filesAlexandru Croitor2019-05-221-2/+0
| * | | | | | | | | | | | | Export tool config and target files for each relevant moduleAlexandru Croitor2019-05-029-0/+9
| * | | | | | | | | | | | | Merge remote-tracking branch 'gerrit/dev' into wip/cmakeTobias Hunger2019-04-164-63/+103
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'dev' into 'wip/cmake-merge'Tobias Hunger2019-04-1652-1139/+2587
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | On second thought, install tracegen and qfloat16-tables toolsAlexandru Croitor2019-04-092-2/+0
| * | | | | | | | | | | | | | | Stop installing unnecessary thingsAlexandru Croitor2019-04-032-0/+2
| * | | | | | | | | | | | | | | Fix AUTOMOC and friends to run only once the tools are builtAlexandru Croitor2019-03-221-0/+2
| * | | | | | | | | | | | | | | Fix Windows buildAlexandru Croitor2019-03-181-0/+1