Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Post-merge fixes | Alexandru Croitor | 2020-01-30 | 6 | -12/+61 | |
| * | | | Merge remote-tracking branch 'origin/dev' into wip/cmake | Alexandru Croitor | 2020-01-29 | 31 | -118/+122 | |
| |\ \ \ | ||||||
| * | | | | Post Merge Fixes | Leander Beernaert | 2020-01-24 | 23 | -75/+232 | |
| * | | | | Merge remote-tracking branch 'origin/dev' into merge-dev | Leander Beernaert | 2020-01-24 | 163 | -6196/+1104 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/dev' into wip/cmake | Leander Beernaert | 2019-11-19 | 11 | -67/+26 | |
| |\ \ \ \ \ | ||||||
| | * \ \ \ \ | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2019-11-02 | 5 | -39/+8 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2019-10-30 | 5 | -28/+17 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2019-10-19 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Merge remote-tracking branch 'origin/dev' into wip/cmake | Simon Hausmann | 2019-10-17 | 20 | -34/+36 | |
| |\| | | | | | | | | ||||||
| | * | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2019-10-17 | 20 | -34/+36 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Merge remote-tracking branch 'origin/dev' into wip/cmake | Alexandru Croitor | 2019-10-14 | 262 | -1442/+1451 | |
| |\| | | | | | | | | | ||||||
| | * | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2019-10-14 | 57 | -201/+222 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Fix compilation | Lars Knoll | 2019-10-04 | 1 | -0/+1 | |
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake | Alexandru Croitor | 2019-10-11 | 48 | -319/+263 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | cmake: add examples/opengl | Frederik Gladhorn | 2019-10-07 | 22 | -1/+810 | |
| * | | | | | | | | | | | | cmake: add examples/vulkan | Frederik Gladhorn | 2019-10-07 | 7 | -1/+253 | |
| * | | | | | | | | | | | | Update public CMake macros' version | Leander Beernaert | 2019-08-23 | 4 | -6/+6 | |
| * | | | | | | | | | | | | Merge branch 'wip/qt6' into wip/cmake | Alexandru Croitor | 2019-08-15 | 9 | -21/+28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake | Alexandru Croitor | 2019-07-11 | 20 | -87/+136 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake | Alexandru Croitor | 2019-06-14 | 239 | -318/+318 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Fix compiling of examples on Android | Simon Hausmann | 2019-06-12 | 237 | -218/+454 | |
| * | | | | | | | | | | | | | | | Fix linking of examples | Simon Hausmann | 2019-06-12 | 218 | -218/+218 | |
| * | | | | | | | | | | | | | | | Fix Standalone Example build when crosscompiling | Leander Beernaert | 2019-06-06 | 1 | -36/+2 | |
| * | | | | | | | | | | | | | | | Allow to build examples as standalone project | Kevin Funk | 2019-06-05 | 249 | -4212/+5995 | |
| * | | | | | | | | | | | | | | | Fix OpenGL vs. GLESv2 linkage, attempt number three | Simon Hausmann | 2019-06-05 | 1 | -2/+0 | |
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/dev' into wip/cmake | Alexandru Croitor | 2019-06-03 | 8 | -28/+60 | |
| |\| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/dev' into wip/cmake | Alexandru Croitor | 2019-06-03 | 40 | -155/+645 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Regenerate more projects that are using uic | Alexandru Croitor | 2019-05-23 | 5 | -9/+59 | |
| * | | | | | | | | | | | | | | | | Rerun pro2cmake on projects that use .ui files | Alexandru Croitor | 2019-05-22 | 21 | -35/+123 | |
| * | | | | | | | | | | | | | | | | Write find_dependency() calls in Qt Module config files | Alexandru Croitor | 2019-05-02 | 1 | -2/+1 | |
| * | | | | | | | | | | | | | | | | Merge commit 'dev' into 'wip/cmake-merge' | Tobias Hunger | 2019-04-16 | 439 | -2476/+3146 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | CMake: allow custom plugin output/install directories | Tobias Hunger | 2019-03-27 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | | CMake: Add widgets examples | Tobias Hunger | 2019-03-26 | 193 | -0/+4055 | |
| * | | | | | | | | | | | | | | | | | CMake: Add more examples | Tobias Hunger | 2019-03-26 | 88 | -5/+1637 | |
| * | | | | | | | | | | | | | | | | | CMake: Use AUTOMOC/AUTOUIC/AUTORCC | Tobias Hunger | 2018-12-14 | 1 | -17/+5 | |
| * | | | | | | | | | | | | | | | | | Begin port of qtbase to CMake | Simon Hausmann | 2018-11-01 | 3 | -0/+22 | |
* | | | | | | | | | | | | | | | | | | QButtonGroup: remove deprecated signals | Vitaly Fanaskov | 2020-02-02 | 3 | -7/+9 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Simon Hausmann | 2020-01-28 | 8 | -21/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | QButtonGroup: deprecate overloaded signals | Christian Ehrlicher | 2020-01-28 | 4 | -12/+14 | |
| * | | | | | | | | | | | | | | | | Deprecate all methods that use QMatrix | Jarek Kobus | 2020-01-28 | 5 | -9/+9 | |
* | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2020-01-28 | 12 | -91/+91 | |
|\| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Doc: Replace some usages of 0/zero/null with \nullptr | Sze Howe Koh | 2020-01-27 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | Fix some qdoc-warnings | Friedemann Kleint | 2020-01-24 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | Replace most use of QVariant::type and occurrences of QVariant::Type | Olivier Goffart | 2020-01-23 | 10 | -89/+89 | |
* | | | | | | | | | | | | | | | | | Move QOpenGLPaintEngine and related classes from QtGui to QtOpenGL | Johan Klokkhammer Helsing | 2020-01-22 | 11 | -6/+8 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2020-01-19 | 2 | -18/+11 | |
|\| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.14' into 5.15 | Qt Forward Merge Bot | 2020-01-18 | 2 | -18/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Pad Navigator example: Remove duplicated property animations | Topi Reinio | 2020-01-16 | 2 | -18/+11 | |
* | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2020-01-16 | 1 | -5/+5 | |
|\| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.14' into 5.15 | Qt Forward Merge Bot | 2020-01-15 | 1 | -5/+5 | |
| |\| | | | | | | | | | | | | | |