Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move QOpenGLFrameBufferObject from QtGui to QtOpenGL | Johan Klokkhammer Helsing | 2020-02-17 | 1 | -1/+1 |
* | Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev" | Alexandru Croitor | 2020-02-14 | 2 | -10/+4 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/wip/cmake' into dev | Alexandru Croitor | 2020-02-13 | 2 | -10/+4 |
| |\ | |||||
| | * | Regenerate projects one last time before mergewip/cmake | Alexandru Croitor | 2020-02-12 | 2 | -10/+4 |
* | | | QtSql: remove compat SQL plugin names | Christian Ehrlicher | 2020-02-13 | 1 | -7/+0 |
|/ / | |||||
* | | Merge remote-tracking branch 'origin/5.15' into dev | Liang Qi | 2020-02-13 | 27 | -47/+53 |
|\ \ | |/ |/| | |||||
| * | Deprecate one overload of QInputDialog::getDouble() for 5.15 | Jan Arve Sæther | 2020-02-12 | 1 | -1/+2 |
| * | QLocalSocket: Deprecate 'error' signal, use 'errorOccurred' insteadv5.15.0-alpha1 | Alexander Akulich | 2020-02-11 | 1 | -2/+1 |
| * | Remove unused variable | Jan Arve Sæther | 2020-02-10 | 1 | -1/+0 |
| * | Merge remote-tracking branch 'origin/5.14' into 5.15 | Qt Forward Merge Bot | 2020-02-04 | 21 | -33/+39 |
| |\ | |||||
| | * | Markdown importer: use Unicode decoding | Giuseppe D'Angelo | 2020-02-03 | 1 | -4/+4 |
| | * | Examples: fix compile without printsupport | Christian Ehrlicher | 2020-01-31 | 10 | -11/+11 |
| | * | Change examples and snippets to pass QDate and QTime by value | Edward Welbourne | 2020-01-30 | 6 | -18/+19 |
| | * | Doc: Specify install path for Vulkan examples | Topi Reinio | 2020-01-30 | 5 | -0/+5 |
| * | | Examples: Replace deprecated QLabel API | Sze Howe Koh | 2020-02-01 | 5 | -11/+11 |
* | | | Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev" | Alexandru Croitor | 2020-02-11 | 276 | -466/+5714 |
|\ \ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/wip/cmake' into dev | Alexandru Croitor | 2020-02-10 | 276 | -466/+5714 |
| |\ \ \ | |||||
| | * | | | Regenerate examples | Alexandru Croitor | 2020-02-04 | 276 | -466/+5714 |
* | | | | | QSpinBox: remove deprecated signal valueChanged(const QString &) | Vitaly Fanaskov | 2020-02-10 | 16 | -24/+24 |
* | | | | | QComboBox: remove deprecated signals | Vitaly Fanaskov | 2020-02-10 | 15 | -32/+32 |
|/ / / / | |||||
* | | | | Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev" | Alexandru Croitor | 2020-02-07 | 317 | -0/+9069 |
|\| | | | |||||
| * | | | 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 |