summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Expand)AuthorAgeFilesLines
* qml_plugin.prf: Use and prefer QML_IMPORT_VERSION over IMPORT_VERSIONUlf Hermann2020-01-171-5/+6
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-161-5/+8
|\
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-151-5/+8
| |\
| | * Fix isysroot for simulator only builds on iosMichal Klocek2020-01-131-5/+8
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-132-2/+3
|\| |
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2020-01-092-2/+3
| |\|
| | * Bump copyright yearJani Heikkinen2020-01-091-1/+1
| | * Android: make sure we don't add _$${QT_ARCH} twiceBogDan Vatra2020-01-091-1/+2
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-092-10/+20
|\| |
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-072-10/+20
| |\|
| | * MinGW: Allow debug-and-release buildsKai Koehne2020-01-061-1/+1
| | * CMake: Fix usage requirements for static builds of Qt on macOSJoerg Bornemann2020-01-061-9/+19
* | | Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-01-072-4/+3
|\| |
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-062-4/+3
| |\|
| | * Always add the extra Android apk and aab targetsAndy Shaw2020-01-021-2/+1
| | * dumpcpp: Use tblCopy to ensure the path is detected correctlyAndy Shaw2020-01-021-2/+2
* | | Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-01-0413-18/+73
|\| |
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-275-25/+33
| |\|
| | * iOS: Silence GL deprecations until we can fix themTor Arne Vestbø2019-12-201-0/+2
| | * Xcode: Disable GPU frame capture and Metal API validation by defaultTor Arne Vestbø2019-12-181-0/+2
| | * wasm: do not use clamp mode for upstream LLVMLorn Potter2019-12-163-25/+29
| * | metatypes: Add no_check_exist to INSTALLS ruleUlf Hermann2019-12-231-0/+1
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2019-12-163-3/+10
| |\|
| | * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-132-1/+7
| | |\
| | | * Set proper TARGET name for libsBogDan Vatra2019-11-291-0/+1
| | | * Fix passing FOO_LIBS variables to configureJoerg Bornemann2019-11-191-1/+6
| | * | Account for when qtquickcompiler is used when getting the resourcesAndy Shaw2019-12-121-2/+3
| * | | Add default location for the Wayland scanner tool on QNXJames McDonnell2019-12-141-0/+2
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-124-14/+51
| |\| |
| | * | wasm: enforce emscripten versionLorn Potter2019-12-112-0/+30
| | * | Fix calls to qtFlattenResources from outside resources.prfJoerg Bornemann2019-12-102-14/+21
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-112-2/+2
|\| | |
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2019-12-102-2/+2
| |\| |
| | * | wasm: Fix clamp modeLorn Potter2019-12-101-1/+1
| | * | WebAssembly: Do not use sed directly for wasm_shell.html deploymentJoerg Bornemann2019-12-091-1/+1
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-043-9/+31
|\| | |
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Ulf Hermann2019-12-033-9/+31
| |\| |
| | * | Fix CONFIG += cmdline testcase creating app bundle paths in MakefilesAaron Linville2019-11-271-0/+3
| | * | Get make docs working better on macOSAndy Shaw2019-11-251-1/+2
| | * | CMake: Fix static build linkage with CMake version lower than 3.13Alexandru Croitor2019-11-251-8/+26
| | |/
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-291-0/+1
|\| |
| * | webassembly: enable opengl es3Lorn Potter2019-11-281-0/+1
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-2516-70/+135
|\| |
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-153-0/+23
| |\|
| | * Add support for passing qrc files to qmlimportscannerAndy Shaw2019-11-131-0/+16
| | * Merge remote-tracking branch 'origin/5.13' into 5.14Liang Qi2019-11-132-0/+7
| | |\
| | | * Fix LTCG linker flags for macOS with separate debug infoJoerg Bornemann2019-11-082-0/+7
| * | | configure: Add sanitizer "fuzzer-no-link"Robert Loehning2019-11-142-0/+10
| * | | Make sure the metatypes are installed in prefix buildsUlf Hermann2019-11-131-1/+1
| * | | In prefix builds, copy metatypes JSON to MODULE_BASE_OUTDIRUlf Hermann2019-11-131-2/+12