summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Merge branch 'backport-3.16-automoc-path-prefix-off' into release-3.16Brad King2020-09-151-5/+11
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Help: Add 3.16.9 release note about AUTOMOC_PATH_PREFIX default changeJoerg Bornemann2020-09-151-5/+11
| * | | | Merge branch 'backport-3.16-automoc-path-prefix-off' into release-3.16Brad King2020-08-104-5/+7
| |\ \ \ \ | | |/ / /
| * | | | Merge branch 'backport-test-FindPkgConfig-isolate-env' into release-3.16Brad King2020-08-071-0/+5
| |\ \ \ \
* | \ \ \ \ Merge topic 'armclang-fixes' into release-3.18Brad King2020-09-111-2/+3
|\ \ \ \ \ \
| * | | | | | ARMClang: Fix link line generation after addition of armlink supportMarc Chevrier2020-09-101-2/+3
* | | | | | | Merge topic 'file-GENERATE-earlier' into release-3.18Brad King2020-09-111-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | file(GENERATE): Create output file structures for all directories firstJosef Angstenberger2020-09-101-0/+2
|/ / / / / /
* | | | | | Merge topic 'gitlab-ci-prefer-mr' into release-3.18Brad King2020-09-101-4/+4
|\ \ \ \ \ \
| * | | | | | gitlab-ci: Prefer MR rules for any pipeline associated with a MRBrad King2020-09-101-4/+4
* | | | | | | Merge topic 'automoc-rerun-missing-dependency' into release-3.18Brad King2020-09-109-7/+132
|\ \ \ \ \ \ \
| * | | | | | | AutoMoc: Re-run moc if a dependency is missingJoerg Bornemann2020-09-099-7/+132
* | | | | | | | Merge topic 'pch-tv90' into release-3.18Brad King2020-09-091-8/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | PCH: Fix 30s wait for VS2008 when used via -Tv90Cristian Adam2020-09-071-8/+20
| |/ / / / / / /
* | | | | | | | Merge topic 'ios-pch-x-lang-header' into release-3.18Brad King2020-09-094-4/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | PCH: Mark CMake PCH source files as -x <lang>-headerCristian Adam2020-09-044-4/+19
| |/ / / / / / /
* | | | | | | | Merge topic 'FindPython-set-CMP0012-NEW' into release-3.18Brad King2020-09-081-1/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | FindPython: CMP0012 must be set to NEWMarc Chevrier2020-09-071-1/+11
|/ / / / / / /
* | | | | | | Merge topic 'ninja-multi-automoc-regression' into release-3.18Brad King2020-09-039-5/+39
|\ \ \ \ \ \ \
| * | | | | | | Ninja Multi-Config: Fix dependencies of utility targetsKyle Edwards2020-09-026-2/+32
| * | | | | | | Ninja Multi-Config: Fix cleaning of utility targets with commandsKyle Edwards2020-09-021-0/+2
| * | | | | | | Ninja Multi-Config: Fix clean:all targetKyle Edwards2020-09-021-0/+1
| * | | | | | | Tests: Pass additional Qt information to Ninja and NMC testsKyle Edwards2020-09-013-3/+4
* | | | | | | | Merge topic 'FindPython-include-dir-ABI-checks' into release-3.18Brad King2020-09-031-8/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | FindPython: enhance ABI checks against include directoryMarc Chevrier2020-09-021-8/+18
|/ / / / / / /
* | | | | | | Merge topic 'automoc-depend-project-file' into release-3.18Brad King2020-09-019-1/+150
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'backport-3.17-automoc-depend-project-file'Brad King2020-08-319-1/+150
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | AutoMoc: Restore support for re-running after project file changesJoerg Bornemann2020-08-319-1/+150
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge topic 'UseSWIG-interface-option' into release-3.18Brad King2020-09-019-1/+71
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | UseSWIG: Update option -interface usageMarc Chevrier2020-08-319-1/+71
|/ / / / / /
* | | | | | Merge branch 'release-3.17' into release-3.18Brad King2020-08-270-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'backport-3.17-cmext-vs16-declval' into release-3.17Brad King2020-08-271-8/+9
| |\ \ \ \ \
| | * | | | | Implement cm::static_reference_cast by declvalSumit Bhardwaj2020-08-271-8/+9
| |/ / / / /
| * | | | | Merge branch 'backport-3.17-automoc-path-prefix-off' into release-3.17Brad King2020-08-104-5/+7
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'FindJNI-arm64' into release-3.18Brad King2020-08-261-0/+2
|\ \ \ \ \ \ \
| * | | | | | | FindJNI: Add arm64 supportMalcolm Parsons2020-08-251-0/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge topic 'cuda-std-for-msvc' into release-3.18Brad King2020-08-261-4/+6
|\ \ \ \ \ \ \
| * | | | | | | CUDA: Support setting CUDA14/17 when using MSVCRobert Maynard2020-08-241-4/+6
| |/ / / / / /
* | | | | | | Merge topic 'automoc_timestamp_nmc_fix' into release-3.18Brad King2020-08-251-0/+4
|\ \ \ \ \ \ \
| * | | | | | | AutoGen: Fix moc and uic dependencies when building Qt itselfAlexandru Croitor2020-08-251-0/+4
| |/ / / / / /
* | | | | | | Merge topic 'msvc_static_assert' into release-3.18Brad King2020-08-253-6/+15
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | MSVC: Record support for c_static_assertRaul Tambre2020-08-203-6/+15
|/ / / / / /
* | | | | | CMake 3.18.2v3.18.2Brad King2020-08-201-1/+1
* | | | | | Merge topic 'FindMPI-cuda-pthread' into release-3.18Brad King2020-08-201-1/+1
|\ \ \ \ \ \
| * | | | | | FindMPI: Fix regression in pthread guardAxel Huebl2020-08-201-1/+1
* | | | | | | Merge topic 'gitlab-ci-msvc-14.27' into release-3.18Brad King2020-08-201-4/+4
|\ \ \ \ \ \ \
| * | | | | | | gitlab-ci: Update Windows builds to MSVC 19.27Brad King2020-08-191-4/+4
* | | | | | | | Merge topic 'msvc_c11' into release-3.18Brad King2020-08-201-0/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Tests: Fix RunCMake.try_compile test for C standards with MSVC 19.27Brad King2020-08-191-0/+9
| |/ / / / / /
* | | | | | | Merge topic 'ep-patch-skip-update-dep' into release-3.18Brad King2020-08-191-27/+5
|\ \ \ \ \ \ \