Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Collect Json Metatypes from CMake's Automoc | Leander Beernaert | 2019-12-04 | 2 | -0/+407 | |
| * | | | | | Post merge fixes | Leander Beernaert | 2019-11-25 | 2 | -4/+4 | |
| * | | | | | Merge remote-tracking branch 'origin/dev' into wip/cmake | Leander Beernaert | 2019-11-19 | 5 | -25/+24 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Regenerate src/* | Alexandru Croitor | 2019-11-14 | 21 | -48/+48 | |
| * | | | | | | Regenerate everything under ./src | Alexandru Croitor | 2019-11-12 | 21 | -21/+0 | |
| * | | | | | | Regenerate a bunch of projects after pro2cmake changes | Alexandru Croitor | 2019-11-12 | 4 | -2/+6 | |
| * | | | | | | Add --skip-install-root option to androidtestrunner | Leander Beernaert | 2019-10-24 | 1 | -4/+15 | |
| * | | | | | | Add Android test runner tool | Leander Beernaert | 2019-10-23 | 2 | -0/+29 | |
| * | | | | | | Re-generate affected cmake files and configure.json after the merge | Simon Hausmann | 2019-10-17 | 2 | -0/+2 | |
| * | | | | | | Merge remote-tracking branch 'origin/dev' into wip/cmake | Simon Hausmann | 2019-10-17 | 1 | -0/+1 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Regenerate files after dev -> wip/cmake merge | Alexandru Croitor | 2019-10-14 | 6 | -0/+6 | |
| * | | | | | | | Merge remote-tracking branch 'origin/dev' into wip/cmake | Alexandru Croitor | 2019-10-14 | 9 | -121/+503 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Regenerate qtbase after wip/qt6 -> wip/cmake merge | Alexandru Croitor | 2019-10-14 | 2 | -0/+6 | |
| * | | | | | | | | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake | Alexandru Croitor | 2019-10-11 | 5 | -587/+576 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Regenerate tools projects | Alexandru Croitor | 2019-10-08 | 14 | -24/+273 | |
| * | | | | | | | | | Clean up tinycbor handling | Simon Hausmann | 2019-10-08 | 4 | -7/+90 | |
| * | | | | | | | | | Regenerate qmake and bootstrap projects | Alexandru Croitor | 2019-10-07 | 1 | -4/+4 | |
| * | | | | | | | | | Merge branch 'wip/qt6' into wip/cmake | Alexandru Croitor | 2019-08-15 | 5 | -67/+64 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake | Alexandru Croitor | 2019-07-11 | 34 | -590/+920 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake | Alexandru Croitor | 2019-06-14 | 7 | -14/+26 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Android: SDK Support | Leander Beernaert | 2019-06-05 | 2 | -0/+32 | |
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/dev' into wip/cmake | Alexandru Croitor | 2019-06-03 | 25 | -473/+623 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Rerun pro2cmake on projects that use .ui files | Alexandru Croitor | 2019-05-22 | 1 | -2/+0 | |
| * | | | | | | | | | | | | | Export tool config and target files for each relevant module | Alexandru Croitor | 2019-05-02 | 9 | -0/+9 | |
| * | | | | | | | | | | | | | Merge remote-tracking branch 'gerrit/dev' into wip/cmake | Tobias Hunger | 2019-04-16 | 4 | -63/+103 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'dev' into 'wip/cmake-merge' | Tobias Hunger | 2019-04-16 | 52 | -1139/+2587 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | On second thought, install tracegen and qfloat16-tables tools | Alexandru Croitor | 2019-04-09 | 2 | -2/+0 | |
| * | | | | | | | | | | | | | | | Stop installing unnecessary things | Alexandru Croitor | 2019-04-03 | 2 | -0/+2 | |
| * | | | | | | | | | | | | | | | Fix AUTOMOC and friends to run only once the tools are built | Alexandru Croitor | 2019-03-22 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | Fix Windows build | Alexandru Croitor | 2019-03-18 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | CMake: Re-generate bootstrap-related CMakeLists.txt files | Tobias Hunger | 2019-03-04 | 5 | -154/+243 | |
| * | | | | | | | | | | | | | | | CMake: Re-generate CMakeLists.txt files for src/tools/* | Tobias Hunger | 2019-03-04 | 4 | -5/+61 | |
| * | | | | | | | | | | | | | | | CMake: Re-generate CMakeLists.txt file for uic | Tobias Hunger | 2019-03-04 | 1 | -12/+36 | |
| * | | | | | | | | | | | | | | | cmake: Use consistent naming scheme for Bootstrap | Kevin Funk | 2019-02-12 | 1 | -10/+11 | |
| * | | | | | | | | | | | | | | | CMake: Use AUTOMOC/AUTOUIC/AUTORCC | Tobias Hunger | 2018-12-14 | 2 | -633/+0 | |
| * | | | | | | | | | | | | | | | Build qlalr | Tobias Hunger | 2018-11-01 | 2 | -0/+14 | |
| * | | | | | | | | | | | | | | | Build qdbusxml2cpp and qdbuscpp2xml | Tobias Hunger | 2018-11-01 | 3 | -0/+35 | |
| * | | | | | | | | | | | | | | | Begin port of qtbase to CMake | Simon Hausmann | 2018-11-01 | 10 | -0/+830 | |
* | | | | | | | | | | | | | | | | Cleanup code where we mixed QHash and QMultiHash iterator code | Lars Knoll | 2020-02-03 | 2 | -13/+9 | |
| |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2020-01-28 | 5 | -4/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Introduce Q_PROPERTY attribute REQUIRED | Fabian Kosmale | 2020-01-23 | 3 | -0/+7 | |
| * | | | | | | | | | | | | | Replace most use of QVariant::type and occurrences of QVariant::Type | Olivier Goffart | 2020-01-23 | 2 | -4/+4 | |
* | | | | | | | | | | | | | | Merge "Merge remote-tracking branch 'origin/5.15' into dev" | Qt Forward Merge Bot | 2020-01-17 | 1 | -5/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2020-01-16 | 1 | -5/+23 | |
| |\| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.14' into 5.15 | Qt Forward Merge Bot | 2020-01-15 | 1 | -5/+23 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | uic/Python: Fix missing QCursor import | Friedemann Kleint | 2020-01-14 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | uic: add customwidget imports support for python | Cristián Maureira-Fredes | 2020-01-14 | 1 | -4/+22 | |
* | | | | | | | | | | | | | | | Introduce Q_MOC_INCLUDE | Olivier Goffart | 2020-01-17 | 5 | -7/+42 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2020-01-13 | 3 | -4/+5 | |
|\| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.14' into 5.15 | Liang Qi | 2020-01-09 | 3 | -4/+5 | |
| |\| | | | | | | | | | | | |