summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | * | | Do not prepend QMAKE_PREFIX_STATICLIB to TARGET for TEMPLATE auxJoerg Bornemann2019-08-141-2/+4
| * | | | | Make Qt relocatableAlexandru Croitor2019-09-071-0/+5
* | | | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-09-064-24/+44
|\| | | | |
| * | | | | Merge remote-tracking branch 'origin/5.13' into 5.14Liang Qi2019-09-044-24/+44
| |\| | | |
| | * | | | Merge remote-tracking branch 'origin/5.12' into 5.13Allan Sandfeld Jensen2019-08-273-18/+8
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Remove broken wild card list from QMake's help outputJoerg Bornemann2019-08-242-6/+5
| | | * | | Fix classical strcmp misuse in VS project generatorJoerg Bornemann2019-08-241-12/+3
| | | | |/ | | | |/|
| | * | | Merge remote-tracking branch 'qt/5.12' into 5.13Paul Olav Tvete2019-08-201-6/+36
| | |\| |
| | | * | Fix qinstall on Windows for directories containing read-only filesJoerg Bornemann2019-08-151-6/+36
* | | | | Remove QMakeLocalFileName::is_nullJoerg Bornemann2019-08-302-7/+7
* | | | | Remove nonsensical initialization from QMakeLocalFileNameJoerg Bornemann2019-08-291-6/+1
|/ / / /
* | | | Merge remote-tracking branch 'origin/dev' into 5.14Liang Qi2019-08-275-198/+26
|\ \ \ \
| * | | | Improve readability of commands in VS project filesJoerg Bornemann2019-08-221-6/+9
| * | | | Fix "conflicting targets" warning when generating VS projectsJoerg Bornemann2019-08-221-0/+9
| * | | | Fix .sln generation for sub-projects with same TARGETJoerg Bornemann2019-08-201-5/+8
| * | | | Remove dead QMakeSourceFileInfo caching feature from QMakeJoerg Bornemann2019-08-203-187/+0
* | | | | Add support for calendars beside GregorianSoroush Rabiei2019-08-203-0/+24
|/ / / /
* | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-08-161-3/+7
|\| | |
| * | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-151-3/+7
| |\| |
| | * | Fix escaping of < and > in QMake's XML generatorJoerg Bornemann2019-08-121-3/+7
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Liang Qi2019-08-132-10/+38
|\ \ \ \
| * | | | Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-08-132-10/+38
| |\| | |
| | * | | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-08-121-5/+5
| | |\| | | | | |/ | | |/|