summaryrefslogtreecommitdiffstats
path: root/qmake/generators/makefile.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-181-5/+2
|\
| * Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-171-1/+1
| |\
| | * Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Olivier Goffart2011-05-161-14/+14
| | |\
| | * \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-061-1/+1
| | |\ \
| | | * | don't ignore create_prl for static pluginsOswald Buddenhagen2011-05-061-1/+1
| * | | | Merge remote branch 'origin/4.8' into qa-review-masterRohan McGovern2011-05-151-51/+44
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefileRohan McGovern2011-05-121-4/+1
* | | | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| |/ / / |/| | |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-05-111-14/+14
|\ \ \ \ | |_|/ / |/| | |
| * | | fixup for 23e772584531278e3b2a6c735ff9db88f7ffd76eJoerg Bornemann2011-05-111-2/+2
| * | | qmake nmake generator: pass MAKEFLAGS to sub-make callsJoerg Bornemann2011-05-051-14/+14
| |/ /
* | | Fix wrong merge of 3aa39b0164ce4bb9eOlivier Goffart2011-04-191-1/+1
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-181-22/+25
|\ \ \ | | |/ | |/|
| * | fixify target source against build treeOswald Buddenhagen2011-04-121-1/+1
| * | fix fixifying of QMAKE_SUBSTITUTESOswald Buddenhagen2011-04-121-6/+10
| * | fix paths of vpath-resolved filesOswald Buddenhagen2011-04-121-4/+3
| * | simplify: absolute fixification ignores the base dir argumentsOswald Buddenhagen2011-04-121-1/+1
| * | simplify: fileFixify for all same paths is always "."Oswald Buddenhagen2011-04-121-3/+1
| * | simplify: the input and output dirs are already normalizedOswald Buddenhagen2011-04-121-1/+1
| * | stop fixifying after first successOswald Buddenhagen2011-04-121-0/+1
| * | create a pwd string with a trailing slash only on demandOswald Buddenhagen2011-04-121-6/+7
| * | useful location reporting for errors from QMAKE_SUBSTITUTESOswald Buddenhagen2011-04-121-1/+1
* | | ReplaceExtraCompilerCacheKey: Don't recreate "::" QString on each call.Andreas Kling2011-03-231-2/+4
* | | Don't cache resolved paths in MakefileGenerator::fileFixify().Andreas Kling2011-03-151-12/+0
| |/ |/|
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ \ | |/
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
* | qmake: don't limit pkg-config writing to unix generatorMark Brand2011-01-101-0/+178
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-211-1/+3
|\ \ | |/
| * fix error messages when configuring QtJoerg Bornemann2010-09-151-1/+3
| * run depend_command even if the binary has no absolute pathOswald Buddenhagen2010-09-131-1/+1
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-301-9/+32
|\ \ | |/
| * fix generated makefile dependenciesOswald Buddenhagen2010-08-261-2/+2
| * add indirect input/output specification capability to QMAKE_SUBSTITUTESOswald Buddenhagen2010-08-231-7/+30
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-3/+4
|\ \ | |/
| * create missing output directories for substituted filesOswald Buddenhagen2010-08-181-0/+1
| * fix QMAKE_SUBSTITUTES with shadow buildsOswald Buddenhagen2010-08-171-3/+3
* | qmake: qmakeDeleteCacheClear() function can be template nowminiak2010-08-031-2/+2
|/
* run dep commands in build dirOswald Buddenhagen2010-07-071-2/+6
* escape backslashes in QMAKE_PRL_LIBSOswald Buddenhagen2010-05-271-1/+1
* Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-05-191-3/+16
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-171-3/+16
| |\
| | * qmake: added possibility to specify the type of an install targetJoerg Bornemann2010-05-171-3/+16
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-171-1/+1
|\ \ \ | |/ /
| * | fix path separators in install targets for MinGW+shJoerg Bornemann2010-05-141-1/+1
| |/
| * Add the QMAKE_FILE_EXT variable to extra compilers generation.Jocelyn Turcotte2010-02-041-0/+13
* | qmake: fix to create proper install target in Makefile at first runZeno Albisser2010-03-171-2/+3
* | don't have every generator duplicate the QMAKE_QMAKE logicOswald Buddenhagen2010-03-031-7/+5
* | decouple host platform mode from target platform modeOswald Buddenhagen2010-02-261-6/+8
* | move $(DEL_FILE) 2> NUL redirection into .conf fileOswald Buddenhagen2010-02-121-14/+2
* | remove remainder of mac9 modeOswald Buddenhagen2010-02-121-3/+1