Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2020-04-08 | 1 | -0/+8 |
|\ | |||||
| * | qmake: Document QML_FOREIGN_METATYPES | Ulf Hermann | 2020-03-26 | 1 | -0/+8 |
* | | Re-generate various CMake projects and configure after merge | Simon Hausmann | 2020-03-16 | 2 | -2/+2 |
* | | Merge "Merge remote-tracking branch 'origin/5.15' into dev" | Simon Hausmann | 2020-03-16 | 4 | -22/+3 |
|\ \ | |||||
| * | | Merge remote-tracking branch 'origin/5.15' into dev | Simon Hausmann | 2020-03-16 | 4 | -22/+3 |
| |\| | |||||
| | * | Doc: Remove \contentspage commands | Topi Reinio | 2020-03-15 | 1 | -14/+0 |
| | * | macOS: Merge qcore_mac cpp and mm files | Tor Arne Vestbø | 2020-03-12 | 3 | -8/+3 |
* | | | cmake: Remove APPLE prefix from platform names | Tor Arne Vestbø | 2020-03-16 | 2 | -2/+2 |
* | | | cmake: Fix naming when referring to Apple macOS | Tor Arne Vestbø | 2020-03-16 | 2 | -2/+2 |
|/ / | |||||
* | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2020-03-11 | 1 | -0/+35 |
|\| | |||||
| * | qmake: Document qmltypes and metatypes | Ulf Hermann | 2020-03-09 | 1 | -0/+35 |
* | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2020-03-03 | 5 | -8/+8 |
|\| | |||||
| * | QMake: Use Qt::SplitBehavior in preference to QString::SplitBehavior | Edward Welbourne | 2020-02-28 | 5 | -8/+8 |
* | | Merge remote-tracking branch 'origin/5.15' into dev | Qt Forward Merge Bot | 2020-02-26 | 3 | -0/+20 |
|\| | |||||
| * | Merge remote-tracking branch 'origin/5.14' into 5.15 | Liang Qi | 2020-02-18 | 3 | -0/+20 |
| |\ | |||||
| | * | Windows: Add install/uninstall rules for target.targets | Kai Koehne | 2020-02-14 | 1 | -0/+14 |
| | * | qmake: Allow the use of a response file when building a library | Andy Shaw | 2020-02-13 | 1 | -0/+2 |
| | * | Doc: Document some missing CONFIG values | Yuhang Zhao | 2020-02-13 | 1 | -0/+4 |
* | | | CMake: Fix c++ standard config tests with MSVC | Alexandru Croitor | 2020-02-18 | 1 | -0/+3 |
* | | | Merge remote-tracking branch 'origin/5.15' into dev | Liang Qi | 2020-02-13 | 2 | -2/+4 |
|\| | | |||||
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15 | Qt Forward Merge Bot | 2020-02-12 | 1 | -1/+3 |
| |\| | |||||
| | * | Doc: Document the ltcg CONFIG value | Joerg Bornemann | 2020-02-10 | 1 | -1/+3 |
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15 | Qt Forward Merge Bot | 2020-02-04 | 1 | -1/+1 |
| |\| | |||||
| | * | Fix line ending in custom build steps of vcxproj files | Joerg Bornemann | 2020-01-30 | 1 | -1/+1 |
* | | | Use C++17 for qmake and force the build of everything with C++17 | Olivier Goffart | 2020-02-08 | 1 | -1/+1 |
* | | | Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev" | Alexandru Croitor | 2020-02-07 | 5 | -2/+409 |
|\ \ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/dev' into wip/cmake | Alexandru Croitor | 2020-01-29 | 5 | -45/+25 |
| |\ \ \ | |||||
| * | | | | Post Merge Fixes | Leander Beernaert | 2020-01-24 | 2 | -0/+3 |
| * | | | | Merge remote-tracking branch 'origin/dev' into merge-dev | Leander Beernaert | 2020-01-24 | 18 | -135/+228 |
| |\ \ \ \ | |||||
| * | | | | | Implement qtbase fixes for superbuilds | Jean-Michaël Celerier | 2020-01-08 | 1 | -1/+1 |
| * | | | | | CMake: Add support for framework builds | Joerg Bornemann | 2020-01-06 | 1 | -1/+1 |
| * | | | | | Remove superfluous qt_internal_add_target_aliases call | Joerg Bornemann | 2019-12-11 | 1 | -2/+0 |
| * | | | | | Post merge fixes | Leander Beernaert | 2019-11-25 | 2 | -2/+6 |
| * | | | | | Merge remote-tracking branch 'origin/dev' into wip/cmake | Leander Beernaert | 2019-11-19 | 7 | -21/+20 |
| |\ \ \ \ \ | |||||
| * | | | | | | Regenerate src/* | Alexandru Croitor | 2019-11-14 | 2 | -12/+12 |
| * | | | | | | Fix developer build with -Werror | Simon Hausmann | 2019-10-15 | 3 | -2/+4 |
| * | | | | | | Fix build of qmake | Alexandru Croitor | 2019-10-15 | 1 | -0/+1 |
| * | | | | | | Merge remote-tracking branch 'origin/dev' into wip/cmake | Alexandru Croitor | 2019-10-14 | 18 | -134/+268 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Regenerate qtbase after wip/qt6 -> wip/cmake merge | Alexandru Croitor | 2019-10-14 | 2 | -0/+9 |
| * | | | | | | | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake | Alexandru Croitor | 2019-10-11 | 18 | -246/+189 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Regenerate qmake and bootstrap projects | Alexandru Croitor | 2019-10-07 | 1 | -6/+7 |
| * | | | | | | | | Use pre-compiled headers when building Qt with cmake | Mårten Nordheim | 2019-09-11 | 1 | -1/+2 |
| * | | | | | | | | Merge branch 'wip/qt6' into wip/cmake | Alexandru Croitor | 2019-08-15 | 19 | -194/+125 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake | Alexandru Croitor | 2019-07-11 | 12 | -85/+160 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix build of modules outside of QtBase when cross-compiling | Simon Hausmann | 2019-06-24 | 1 | -8/+0 |
| * | | | | | | | | | | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake | Alexandru Croitor | 2019-06-14 | 6 | -6/+8 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Revert "cmake: Make CMake superbuilds work" | Alexandru Croitor | 2019-06-14 | 1 | -1/+1 |
| * | | | | | | | | | | | cmake: Make CMake superbuilds work | Kevin Funk | 2019-06-14 | 1 | -1/+1 |
| * | | | | | | | | | | | Automatically find apple frameworks when building a repo | Alexandru Croitor | 2019-06-13 | 1 | -2/+0 |
| * | | | | | | | | | | | cmake: Add warnings_are_errors option | Albert Astals Cid | 2019-06-05 | 4 | -4/+3 |