summaryrefslogtreecommitdiffstats
path: root/qmake/library
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-02-083-25/+33
|\
| * add a bunch of complementary options to -afterOswald Buddenhagen2017-02-063-25/+33
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-255-5/+11
|\|
| * don't pass qmake configure arguments to sub-projectsOswald Buddenhagen2017-01-062-2/+2
| * micro-optimize FOO-=$$BAR for empty FOOOswald Buddenhagen2016-12-201-1/+4
| * fix conditionals on the spec after assigning QMAKESPECOswald Buddenhagen2016-12-201-0/+1
| * make QMAKE_DIR_SEP magic on writingOswald Buddenhagen2016-12-202-2/+4
* | doc: Fix all remaining "Cannot tie" errors in QtBaseMartin Smith2017-01-061-1/+1
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-166-10/+64
|\|
| * qmake: introduce magic bypassNesting() scopeOswald Buddenhagen2016-12-133-1/+46
| * move generation of qconfig.cpp (and qt.conf) to qmake-based configureOswald Buddenhagen2016-12-132-1/+8
| * make qmake abort when $$prompt() gets EOFOswald Buddenhagen2016-12-133-8/+10
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-131-1/+12
|\|
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-241-1/+12
| |\
| | * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-231-1/+12
| | |\
| | | * Add support for Visual Studio 2017Oliver Wolff2016-11-221-1/+12
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-11-171-11/+65
|\| | |
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-161-2/+1
| |\| |
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-151-2/+1
| | |\|
| | | * fix $$section()'s bad argument count error messageOswald Buddenhagen2016-11-141-2/+1
| * | | qmake: make discard_from() patch up QMAKE_INTERNAL_INCLUDED_FILES as wellOswald Buddenhagen2016-11-151-0/+4
| * | | qmake: let discard_from() discard function definitions as wellOswald Buddenhagen2016-11-151-0/+12
| * | | qmake: add "undecorated" mode to $$prompt()Oswald Buddenhagen2016-11-151-6/+12
| * | | Improve QMake JSON errorAllan Sandfeld Jensen2016-11-151-3/+36
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-10-134-19/+9
|\| | |
| * | | fix build with QT_NO_CAST_FROM_ASCIIOswald Buddenhagen2016-10-071-2/+2
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-10-063-2/+5
|/| | | | |/ /
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-013-2/+5
| |\|
| | * fix warning in qmakevfs without PROEVALUATOR_FULLOswald Buddenhagen2016-09-291-0/+1
| | * report cumulativity of $$system() and evaluator error output as wellOswald Buddenhagen2016-09-292-2/+4
* | | add discard_from() functionOswald Buddenhagen2016-08-253-5/+45
* | | make include(,<into>) implementation a bit less convolutedOswald Buddenhagen2016-08-252-6/+9
* | | optimize operator+ ProString vs. char*Oswald Buddenhagen2016-08-251-2/+2
* | | Merge dev into 5.8Oswald Buddenhagen2016-08-222-7/+18
|\ \ \
| * | | add support for returning the command's exit status to $$system()Oswald Buddenhagen2016-08-102-6/+17
| * | | print no message at all when no argument is supplied to error()Oswald Buddenhagen2016-08-081-1/+1
* | | | Support C++17 fallthrough attributeAllan Sandfeld Jensen2016-08-192-4/+4
|/ / /
* | | Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-08-011-3/+10
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-261-3/+10
| |\|
| | * terminate when command called by system() got SIGINT or SIGQUITOswald Buddenhagen2016-07-211-3/+10
* | | Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-07-194-88/+145
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-154-87/+145
| |\|
| | * fix raw data leak in $$absolute_path()Oswald Buddenhagen2016-07-131-1/+5
| | * fix calculations of worst-case size requirements for token bufferOswald Buddenhagen2016-07-131-6/+9
| | * fix custom functions inheriting other functions' argumentsOswald Buddenhagen2016-07-131-17/+39
| | * make error() propagate from requires() and REQUIRES=Oswald Buddenhagen2016-07-133-6/+12
| | * make error() propagate from custom replace functionsOswald Buddenhagen2016-07-132-51/+73
| | * fix error() not propagating through if()Oswald Buddenhagen2016-07-133-7/+8
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-041-1/+0
| |\|
| | * nuke dead expandVariableReferences() overload prototypeOswald Buddenhagen2016-06-301-1/+0