summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-01-295-45/+25
|\
| * Merge remote-tracking branch 'origin/5.15' into devSimon Hausmann2020-01-281-2/+5
| |\
| | * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-2/+5
| | |\
| | | * Fix handling of the DEFINES_DEBUG/DEFINES_RELEASE variablesJoerg Bornemann2020-01-231-2/+5
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-284-43/+20
| |\| |
| | * | Purge the dep_cd_cmd parameter from callExtraCompilerDependCommandJoerg Bornemann2020-01-244-19/+8
| | * | De-duplicate the last occurrence of calling a depend_commandJoerg Bornemann2020-01-241-28/+16
* | | | Post Merge FixesLeander Beernaert2020-01-242-0/+3
* | | | Merge remote-tracking branch 'origin/dev' into merge-devLeander Beernaert2020-01-2418-135/+228
|\| | |
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-192-3/+3
| |\| |
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-182-3/+3
| | |\|
| | | * Doc: Fix qdoc compilation errors qtbaseNico Vertriest2020-01-172-3/+3
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-163-9/+27
| |\| |
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-153-9/+27
| | |\|
| | | * Fix mkdir warning for object_parallel_to_source projectsJoerg Bornemann2020-01-141-1/+1
| | | * doc: improve SUBDIRS documentation for dependency handlingSamuel Gaist2020-01-142-8/+26
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-132-0/+32
| |\| |
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2020-01-092-0/+32
| | |\|
| | | * Doc: Extend the documentation about qmake scopesJoerg Bornemann2020-01-092-0/+32
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-104-29/+17
| |\| |
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-094-29/+17
| | |\|
| | | * Fix dependency resolution for extra compilers in VS projectsJoerg Bornemann2020-01-074-29/+17
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-091-0/+6
| |\| |
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-071-0/+6
| | |\|
| | | * qmake: Document QML_IMPORT_PATHKai Koehne2020-01-061-0/+6
| * | | Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-01-046-19/+38
| |\| |
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-272-5/+6
| | |\|
| | | * Doc: Fix name of no_check_exist flagUlf Hermann2019-12-231-1/+1
| | | * Fix "Broken filename passed to function" message for qmake -tp vcJoerg Bornemann2019-12-161-4/+5
| | * | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Liang Qi2019-12-162-12/+19
| | |\ \
| | | * | Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2019-12-162-12/+19
| | | |\|
| | | | * Xcode: Use output directory as SYMROOT when shadow-buildingTor Arne Vestbø2019-12-121-11/+18
| | | | * Doc: Fix qdoc compilation errors qtbaseNico Vertriest2019-12-121-1/+1
| | * | | Mark the old style unprefixed stream functions deprecatedAllan Sandfeld Jensen2019-12-161-5/+5
| | |/ /
| | * | Split cborstream feature in twoUlf Hermann2019-12-123-2/+13
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-111-1/+1
| |\| |
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2019-12-101-1/+1
| | |\|
| | | * Fix qmake's sed functionality for input containing CR+LF newlinesAlessandro Portale2019-12-051-1/+1
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-258-75/+105
| |\| |
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-201-1/+1
| | |\|
| | | * qmake: Remove /O3 from win32-iccYuhang Zhao2019-11-191-1/+1
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-192-14/+18
| | |\|
| | | * Fix precompiled headers on macOSJoerg Bornemann2019-11-182-14/+18
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-086-60/+86
| | |\|
| | | * Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-11-061-2/+4
| | | |\
| | | | * Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-11-061-2/+4
| | | | |\
| | | | | * Fix assert in VS project generatorJoerg Bornemann2019-10-151-2/+4
| | | * | | Be able to create a response file for other generators tooAndy Shaw2019-11-065-58/+82
| | | |/ /
* | | | | Implement qtbase fixes for superbuildsJean-Michaël Celerier2020-01-081-1/+1
* | | | | CMake: Add support for framework buildsJoerg Bornemann2020-01-061-1/+1