Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2020-03-03 | 2 | -4/+3 |
|\ | |||||
| * | Use Qt::SplitBehavior in preference to QString::SplitBehavior | Edward Welbourne | 2020-02-28 | 2 | -4/+3 |
* | | Remove various traces of QGL | Johan Klokkhammer Helsing | 2020-02-28 | 1 | -15/+0 |
* | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2020-02-26 | 3 | -4/+9 |
|\| | |||||
| * | moc: Record whether a meta object is an object, gadget, or namespace | Ulf Hermann | 2020-02-13 | 3 | -4/+9 |
* | | CMake: Allow building bundled 3rd party libraries in qtbase | Alexandru Croitor | 2020-02-25 | 2 | -35/+41 |
* | | MetaObject: store the QMetaType of the properties | Olivier Goffart | 2020-02-25 | 1 | -0/+12 |
* | | Normalize types at compile time | Olivier Goffart | 2020-02-20 | 1 | -23/+2 |
* | | Remove QLinkedList | Sona Kurazyan | 2020-02-19 | 2 | -8/+0 |
* | | CMake: Fix c++ standard config tests with MSVC | Alexandru Croitor | 2020-02-18 | 1 | -1/+3 |
* | | Merge remote-tracking branch 'origin/5.15' into dev | Liang Qi | 2020-02-13 | 3 | -7/+8 |
|\| | |||||
| * | Merge remote-tracking branch 'origin/5.14' into 5.15 | Qt Forward Merge Bot | 2020-02-12 | 1 | -1/+2 |
| |\ | |||||
| | * | Set also ndk.dir | BogDan Vatra | 2020-02-11 | 1 | -1/+2 |
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15 | Qt Forward Merge Bot | 2020-02-08 | 1 | -4/+4 |
| |\| | |||||
| | * | uic/Python: Add imports for Q(Date)Time, QKeySequence | Friedemann Kleint | 2020-02-06 | 1 | -4/+4 |
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15 | Qt Forward Merge Bot | 2020-02-06 | 1 | -1/+1 |
| |\| | |||||
| | * | uic/Python: Set form object name correctly | Friedemann Kleint | 2020-02-05 | 1 | -1/+1 |
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15 | Qt Forward Merge Bot | 2020-01-29 | 1 | -1/+1 |
| |\| | |||||
| | * | Android: Respect the --no-build option for APK packages | Andy Shaw | 2020-01-18 | 1 | -1/+1 |
* | | | Merge remote-tracking branch 'origin/wip/cmake' into dev | Alexandru Croitor | 2020-02-10 | 4 | -16/+8 |
|\ \ \ | |||||
| * | | | Regenerate projects to correctly handle private dependencies | Alexandru Croitor | 2020-02-05 | 4 | -16/+8 |
* | | | | moc: Extend revision markers to allow for major and minor version | Ulf Hermann | 2020-02-07 | 2 | -36/+54 |
* | | | | Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev" | Alexandru Croitor | 2020-02-07 | 25 | -4/+1501 |
|\| | | | |||||
| * | | | Merge remote-tracking branch 'origin/dev' into wip/cmake | Alexandru Croitor | 2020-01-29 | 5 | -4/+11 |
| |\ \ \ | |||||
| * | | | | Add initial support for CMake "Ninja Multi-Config" generator | Alexandru Croitor | 2020-01-27 | 1 | -1/+11 |
| * | | | | Post Merge Fixes | Leander Beernaert | 2020-01-24 | 2 | -0/+10 |
| * | | | | Merge remote-tracking branch 'origin/dev' into merge-dev | Leander Beernaert | 2020-01-24 | 29 | -290/+542 |
| |\ \ \ \ | |||||
| * | | | | | Remove invalid conversion and make it clearer for the future | Leander Beernaert | 2020-01-14 | 1 | -28/+28 |
| * | | | | | Regenerate src/ | Leander Beernaert | 2020-01-14 | 4 | -6/+31 |
| * | | | | | CMake: Add support for framework builds | Joerg Bornemann | 2020-01-06 | 1 | -2/+2 |
| * | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ |