summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \ | | | |/
| | | * Doc: Extend QMake's documentation of RC_FILE and RES_FILEJoerg Bornemann2019-08-121-5/+5
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-08-051-5/+33
| | |\ \ | | | |/
| | | * Fix dependency_libs entry of .la filesJoerg Bornemann2019-08-031-5/+33
* | | | Determine dependencies of Windows resource filesJoerg Bornemann2019-08-132-2/+10
|/ / /
* | | Do not use QList<QMakeLocalFileName>Joerg Bornemann2019-08-126-20/+18
* | | Warn about conflicting DESTDIR/TARGET combination in debug_and_releaseJoerg Bornemann2019-08-095-0/+57
* | | QMakeLocalFileName: remove mutable specifier from real_nameJoerg Bornemann2019-08-081-1/+2
* | | Remove special handling of DLLDESTDIR on WindowsJoerg Bornemann2019-08-031-8/+2
* | | Remove QMake's -createstub optionJoerg Bornemann2019-08-038-39/+0
* | | Fix Makefile re-generation for debug_and_release buildsJoerg Bornemann2019-08-021-0/+12
* | | Rename MakefileGenerator::build_args() to ...::fullBuildArgs()Joerg Bornemann2019-07-312-5/+5
* | | Remove dead code from metamakefile.cppJoerg Bornemann2019-07-311-14/+7
* | | Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-07-302-37/+18
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-301-10/+9
| |\ \ | | |/
| | * qmake: Keep -force_load with library when merging linker flagsTor Arne Vestbø2019-07-291-3/+6
| | * qmake: Don't allow -framework without second argument when merging flagsTor Arne Vestbø2019-07-291-8/+4
| * | qmake: Use a simple response file for ar on mingwOrgad Shaneh2019-07-291-27/+9
* | | Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-07-222-5/+6
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-202-5/+6
| |\ \ | | |/
| | * qmake: fix variable naming conflicts with C++20 keywordYulong Bai2019-07-191-3/+3
| | * qmake: fix move semanticsGiuseppe D'Angelo2019-07-181-2/+3
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-171-26/+13
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-121-26/+13
| |\ \ | | |/
| | * Revert "Fix determination of source and build roots"Jörg Bornemann2019-07-041-26/+13
* | | QMake: fix GCC 9 -Wdeprecated-copy warningsMarc Mutz2019-07-152-1/+1
* | | QMake: be less laissez-faire with implicit conversions to QCharMarc Mutz2019-07-153-5/+5
* | | Move text-related code out of corelib/tools/ to corelib/text/Edward Welbourne2019-07-102-20/+23
* | | Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-07-051-0/+8
|\ \ \ | |/ /
| * | CMake: Fix handling of static dependencies that have spaces in pathAlexandru Croitor2019-07-051-0/+8
* | | Do not ignore exit codes when installing meta filesJoerg Bornemann2019-07-011-3/+3
* | | Introduce Q_NAMESPACE_EXPORTGiuseppe D'Angelo2019-06-281-3/+11
* | | Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-06-273-1/+9
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-06-253-1/+9
| |\ \ | | |/
| | * Add QDebug streaming operator for ProStringJoerg Bornemann2019-06-242-0/+8
| | * Fix 'clean' target for MinGW DLLsJoerg Bornemann2019-06-241-1/+1
* | | qmake: Let evaluateFunction() return error for infinite recursionChristian Kandeler2019-06-181-1/+1
* | | Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-06-1411-81/+131
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.13.0' into 5.13Liang Qi2019-06-111-8/+12
| |\ \
| | * | qmake: Escape trailing backslash for OBJECTS_DIR for MinGWKai Koehne2019-05-131-8/+12
| * | | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-06-0711-73/+119
| |\ \ \ | | | |/ | | |/|
| | * | qmake: CleanupKai Koehne2019-06-056-6/+5
| | * | Fix determination of source and build rootsJoerg Bornemann2019-06-041-13/+26
| | * | Make sure .pc, .prl and .la files are created for header_only modulesJoerg Bornemann2019-06-033-5/+10
| | * | Do not write 'Libs:' into .pc files if TEMPLATE is not 'lib'Joerg Bornemann2019-06-031-36/+38