summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/ /
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-011-1/+1
|\| | |
| * | | qmake: Don't call QDir::count() over and overUlf Hermann2019-10-301-1/+1
* | | | Make QList an alias to QVectorLars Knoll2019-10-302-6/+1
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-272-8/+4
|\| | |
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-262-8/+4
| |\| |
| | * | Fix precompiled headers for ClangChristian Romberg2019-10-252-8/+4
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-264-6/+14
|\| | |
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-251-1/+1
| |\| |
| | * | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-241-1/+1
| | |\|
| | | * Doc: Fix QMAKE_EXTRA_TARGETS snippet descriptionJoerg Bornemann2019-10-101-1/+1
| * | | Reimplement JSON support on top of CborUlf Hermann2019-10-213-5/+13
| |/ /
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-111-1/+2
|\| |
| * | qmake: Avoid writing glue project file when only generating prl filesTor Arne Vestbø2019-10-091-1/+2
* | | Remove leftovers from QML1Lars Knoll2019-10-101-1/+0
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-065-12/+50
|\| |
| * | Include likely-adjusted uiLanguages for the system localeEdward Welbourne2019-10-042-2/+7
| * | qmake: Parse -framework link lines the same way the linker doesTor Arne Vestbø2019-10-041-5/+2
| * | Make conflicting targets check less strictJoerg Bornemann2019-10-031-0/+4
| * | Fix needless resolution of -l LIBS entries on WindowsJoerg Bornemann2019-10-031-5/+37
* | | Merge remote-tracking branch 'origin/5.15' into devLiang Qi2019-10-042-9/+16
|\| |
| * | qmake: Place prl files under Resources in framework bundlesTor Arne Vestbø2019-10-032-9/+16
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-021-0/+18
|\| |
| * | Merge remote-tracking branch 'origin/5.13' into 5.14Liang Qi2019-09-301-0/+18
| |\|
| | * Doc: Document CONFIG values that are worth documentingJoerg Bornemann2019-09-271-0/+18
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-09-241-29/+22
|\| |
| * | Merge remote-tracking branch 'origin/5.13' into 5.14Liang Qi2019-09-231-29/+22
| |\|
| | * qmake: Replace WinRT with UWP in the qmake ManualLeena Miettinen2019-09-201-29/+22