summaryrefslogtreecommitdiffstats
path: root/src/tools
Commit message (Expand)AuthorAgeFilesLines
* rcc: Teach rcc the --no-zstd optionAlexandru Croitor2020-03-123-7/+23
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-111-0/+16
|\
| * Android: Bump gradle (plugin) versionsBogDan Vatra2020-03-041-0/+16
* | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Lars Knoll2020-03-041-0/+2
|\ \
| * | Merge remote-tracking branch 'origin/5.15' into devLars Knoll2020-03-041-0/+2
| |\|
| | * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-291-0/+2
| | |\
| | | * uic: handle header tag for python importsCristián Maureira-Fredes2020-02-271-0/+2
* | | | Update uic's class lib map to reflect QtOpenGLWidgetsFriedemann Kleint2020-03-041-0/+1
* | | | Android: Increase minimum API level to Android-23 / Android 6Eskil Abrahamsen Blomfeldt2020-03-041-2/+2
|/ / /
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-032-4/+3
|\| |
| * | Use Qt::SplitBehavior in preference to QString::SplitBehaviorEdward Welbourne2020-02-282-4/+3
* | | Remove various traces of QGLJohan Klokkhammer Helsing2020-02-281-15/+0
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-263-4/+9
|\| |
| * | moc: Record whether a meta object is an object, gadget, or namespaceUlf Hermann2020-02-133-4/+9
* | | CMake: Allow building bundled 3rd party libraries in qtbaseAlexandru Croitor2020-02-252-35/+41
* | | MetaObject: store the QMetaType of the propertiesOlivier Goffart2020-02-251-0/+12
* | | Normalize types at compile timeOlivier Goffart2020-02-201-23/+2
* | | Remove QLinkedListSona Kurazyan2020-02-192-8/+0
* | | CMake: Fix c++ standard config tests with MSVCAlexandru Croitor2020-02-181-1/+3
* | | 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