Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'release-3.17' into release-3.18 | Brad King | 2020-09-15 | 1 | -0/+9 |
|\ | |||||
| * | CMake 3.17.5v3.17.5 | Brad King | 2020-09-15 | 1 | -1/+1 |
| * | Merge branch 'backport-3.17-automoc-path-prefix-off' into release-3.17 | Brad King | 2020-09-15 | 1 | -0/+9 |
| |\ | |||||
| | * | Help: Add 3.17.5 release note about AUTOMOC_PATH_PREFIX default change | Joerg Bornemann | 2020-09-15 | 1 | -0/+9 |
| | * | Merge branch 'backport-3.16-automoc-path-prefix-off' | Brad King | 2020-09-15 | 1 | -5/+11 |
| | |\ | |||||
| * | \ | Merge branch 'release-3.16' into release-3.17 | Brad King | 2020-09-15 | 1 | -5/+11 |
| |\ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'backport-3.17-automoc-depend-project-file' into release-3.17 | Brad King | 2020-08-31 | 9 | -1/+150 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'release-3.16' into release-3.18 | Brad King | 2020-09-15 | 1 | -5/+11 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | CMake 3.16.9v3.16.9 | Brad King | 2020-09-15 | 1 | -1/+1 |
| * | | | | Merge branch 'backport-3.16-automoc-path-prefix-off' into release-3.16 | Brad King | 2020-09-15 | 1 | -5/+11 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Help: Add 3.16.9 release note about AUTOMOC_PATH_PREFIX default change | Joerg Bornemann | 2020-09-15 | 1 | -5/+11 |
| * | | | | Merge branch 'backport-3.16-automoc-path-prefix-off' into release-3.16 | Brad King | 2020-08-10 | 4 | -5/+7 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | Merge branch 'backport-test-FindPkgConfig-isolate-env' into release-3.16 | Brad King | 2020-08-07 | 1 | -0/+5 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge topic 'armclang-fixes' into release-3.18 | Brad King | 2020-09-11 | 1 | -2/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | ARMClang: Fix link line generation after addition of armlink support | Marc Chevrier | 2020-09-10 | 1 | -2/+3 |
* | | | | | | | Merge topic 'file-GENERATE-earlier' into release-3.18 | Brad King | 2020-09-11 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | file(GENERATE): Create output file structures for all directories first | Josef Angstenberger | 2020-09-10 | 1 | -0/+2 |
|/ / / / / / | |||||
* | | | | | | Merge topic 'gitlab-ci-prefer-mr' into release-3.18 | Brad King | 2020-09-10 | 1 | -4/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | gitlab-ci: Prefer MR rules for any pipeline associated with a MR | Brad King | 2020-09-10 | 1 | -4/+4 |
* | | | | | | | Merge topic 'automoc-rerun-missing-dependency' into release-3.18 | Brad King | 2020-09-10 | 9 | -7/+132 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | AutoMoc: Re-run moc if a dependency is missing | Joerg Bornemann | 2020-09-09 | 9 | -7/+132 |
* | | | | | | | | Merge topic 'pch-tv90' into release-3.18 | Brad King | 2020-09-09 | 1 | -8/+20 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | PCH: Fix 30s wait for VS2008 when used via -Tv90 | Cristian Adam | 2020-09-07 | 1 | -8/+20 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge topic 'ios-pch-x-lang-header' into release-3.18 | Brad King | 2020-09-09 | 4 | -4/+19 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | PCH: Mark CMake PCH source files as -x <lang>-header | Cristian Adam | 2020-09-04 | 4 | -4/+19 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge topic 'FindPython-set-CMP0012-NEW' into release-3.18 | Brad King | 2020-09-08 | 1 | -1/+11 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | FindPython: CMP0012 must be set to NEW | Marc Chevrier | 2020-09-07 | 1 | -1/+11 |
|/ / / / / / / | |||||
* | | | | | | | Merge topic 'ninja-multi-automoc-regression' into release-3.18 | Brad King | 2020-09-03 | 9 | -5/+39 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Ninja Multi-Config: Fix dependencies of utility targets | Kyle Edwards | 2020-09-02 | 6 | -2/+32 |
| * | | | | | | | Ninja Multi-Config: Fix cleaning of utility targets with commands | Kyle Edwards | 2020-09-02 | 1 | -0/+2 |
| * | | | | | | | Ninja Multi-Config: Fix clean:all target | Kyle Edwards | 2020-09-02 | 1 | -0/+1 |
| * | | | | | | | Tests: Pass additional Qt information to Ninja and NMC tests | Kyle Edwards | 2020-09-01 | 3 | -3/+4 |
* | | | | | | | | Merge topic 'FindPython-include-dir-ABI-checks' into release-3.18 | Brad King | 2020-09-03 | 1 | -8/+18 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | FindPython: enhance ABI checks against include directory | Marc Chevrier | 2020-09-02 | 1 | -8/+18 |
|/ / / / / / / | |||||
* | | | | | | | Merge topic 'automoc-depend-project-file' into release-3.18 | Brad King | 2020-09-01 | 9 | -1/+150 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'backport-3.17-automoc-depend-project-file' | Brad King | 2020-08-31 | 9 | -1/+150 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | AutoMoc: Restore support for re-running after project file changes | Joerg Bornemann | 2020-08-31 | 9 | -1/+150 |
| | | |_|_|_|/ | | |/| | | | | |||||
* | | | | | | | Merge topic 'UseSWIG-interface-option' into release-3.18 | Brad King | 2020-09-01 | 9 | -1/+71 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | UseSWIG: Update option -interface usage | Marc Chevrier | 2020-08-31 | 9 | -1/+71 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'release-3.17' into release-3.18 | Brad King | 2020-08-27 | 0 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'backport-3.17-cmext-vs16-declval' into release-3.17 | Brad King | 2020-08-27 | 1 | -8/+9 |
| |\ \ \ \ \ | |||||
| | * | | | | | Implement cm::static_reference_cast by declval | Sumit Bhardwaj | 2020-08-27 | 1 | -8/+9 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'backport-3.17-automoc-path-prefix-off' into release-3.17 | Brad King | 2020-08-10 | 4 | -5/+7 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge topic 'FindJNI-arm64' into release-3.18 | Brad King | 2020-08-26 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | FindJNI: Add arm64 support | Malcolm Parsons | 2020-08-25 | 1 | -0/+2 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge topic 'cuda-std-for-msvc' into release-3.18 | Brad King | 2020-08-26 | 1 | -4/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | CUDA: Support setting CUDA14/17 when using MSVC | Robert Maynard | 2020-08-24 | 1 | -4/+6 |
| |/ / / / / / | |||||
* | | | | | | | Merge topic 'automoc_timestamp_nmc_fix' into release-3.18 | Brad King | 2020-08-25 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | AutoGen: Fix moc and uic dependencies when building Qt itself | Alexandru Croitor | 2020-08-25 | 1 | -0/+4 |
| |/ / / / / / | |||||
* | | | | | | | Merge topic 'msvc_static_assert' into release-3.18 | Brad King | 2020-08-25 | 3 | -6/+15 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | |