summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-09-226-12/+34
|\| |
| * | Merge remote-tracking branch 'origin/5.13' into 5.14Joerg Bornemann2019-09-206-12/+34
| |\|
| | * Ignore non-existent .ui file dependenciesJoerg Bornemann2019-09-182-0/+10
| | * Make it possible to undefine NDEBUG for nmake and VS projectsJoerg Bornemann2019-09-184-8/+20
* | | Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2019-09-174-46/+82
|\| |
| * | Merge remote-tracking branch 'origin/5.13' into 5.14Friedemann Kleint2019-09-093-46/+77
| |\|
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-082-43/+69
| | |\
| | | * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-073-46/+77
| | | |\
| | | | * Don't add default lib dirs to LIBRARY_SEARCH_PATHS in xcode projectsv5.12.5Joerg Bornemann2019-09-031-1/+4
| | | | * Fix library suffix replacement for xcode projectsJoerg Bornemann2019-08-312-43/+69
| | | | * Do not prepend QMAKE_PREFIX_STATICLIB to TARGET for TEMPLATE auxJoerg Bornemann2019-08-281-2/+4
| | * | | Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-052-3/+8
| | |\ \ \
| | | * | | Don't add default lib dirs to LIBRARY_SEARCH_PATHS in xcode projectsJoerg Bornemann2019-08-271-1/+4