summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-237-59/+121
|\
| * don't install mac bundles atomicallyOswald Buddenhagen2013-07-222-26/+59
| * mac frameworks: link target alias to Current versionOswald Buddenhagen2013-07-221-3/+2
| * fix target strip-ing inside mac bundlesOswald Buddenhagen2013-07-221-8/+13
| * make unescapeFilePath() less inefficientOswald Buddenhagen2013-07-221-6/+2
| * escape paths coming from prl filesOswald Buddenhagen2013-07-222-3/+9
| * unbreak use of not-overquoted ICON entriesOswald Buddenhagen2013-07-221-3/+2
| * fix c-quoting of strings which contain quotesOswald Buddenhagen2013-07-221-1/+1
| * resolve output of .depend_command relative to $$OUT_PWDOswald Buddenhagen2013-07-221-4/+28
| * Changed digia contact details to */legal, updated licensesTeemu Kaukoranta2013-07-202-2/+2
| * un-clash iterator namesOswald Buddenhagen2013-07-151-8/+8
| * undo accidental string mergeOswald Buddenhagen2013-07-151-1/+1
* | update m_featureRoots less aggressivelyOswald Buddenhagen2013-07-191-1/+2
* | cache results of feature searchOswald Buddenhagen2013-07-192-24/+62
* | minor optimization: don't concatenate strings needlesslyOswald Buddenhagen2013-07-193-1/+8
* | don't unnecessarily use QFileInfo::filePath()Oswald Buddenhagen2013-07-191-3/+3
* | Merge branch 'stable' into devSergio Ahumada2013-07-1115-553/+579
|\|
| * MANIFEST:NO is not written to vcprojKatja2013-07-051-0/+2
| * merge string literalsOswald Buddenhagen2013-07-047-540/+540
| * VPATH resolution: don't crash when $(FOO) expands to nothingOswald Buddenhagen2013-07-041-0/+4
| * don't crash if builddir is suffix of sourcedir (or vice-versa)Oswald Buddenhagen2013-07-041-1/+2
| * add support for Visual Studio 2013Joerg Bornemann2013-07-044-3/+18
| * make split_value_list() even less sane againOswald Buddenhagen2013-07-031-5/+8
| * Only add the res_file to the generated files if there is no rc_fileAndy Shaw2013-07-021-1/+2
| * qmake: Change two scopes to mac instead of macxTor Arne Vestbø2013-07-021-2/+2
* | Xcode: Fix defines in OTHER_C/CPLUSPLUSFLAGS for project file outputTor Arne Vestbø2013-07-032-5/+11
* | Xcode: Fix string quoting to match ASCII plist formatTor Arne Vestbø2013-07-031-20/+60
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-277-5/+63
|\|
| * Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/s...Frederik Gladhorn2013-06-252-3/+4
| |\
| | * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-202-3/+4
| | |\
| | | * make Makefiles not depend on .qmake.superOswald Buddenhagen2013-06-152-3/+4
| * | | basic manifest tool support in vc(x)proj generatorJoerg Bornemann2013-06-255-0/+58
| * | | Fix incorrect uname usage.Chris Stylianou2013-06-211-1/+1
| * | | Don't depend on the command for extra compilers automaticallyAndy Shaw2013-06-201-1/+0
| |/ /
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-2037-4/+6156
|\| |
| * | Doc: added more details about contains(variablename,value)Nico Vertriest2013-06-191-2/+4
| * | update commentOswald Buddenhagen2013-06-171-4/+3
| * | move qmake docs into qtbaseOswald Buddenhagen2013-06-1736-0/+6151
* | | Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/stagi...Frederik Gladhorn2013-06-134-21/+31
|\ \ \
| * | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-124-21/+31
| |\| |
| | * | Xcode: Don't set TARGET_BUILD_DIR; that's handled by a copy phaseTor Arne Vestbø2013-06-111-1/+1
| | * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-052-3/+3
| | |\|
| | | * run syncqt only for builds from gitOswald Buddenhagen2013-06-032-3/+3
| | * | Changed project dependencies for solution filesAndrew Patterson2013-06-051-17/+27
* | | | don't copy mkspecs to build directoryOswald Buddenhagen2013-06-121-0/+2
* | | | introduce /src qmake property variantsOswald Buddenhagen2013-06-122-19/+36
* | | | remove pointless string conversionOswald Buddenhagen2013-06-121-2/+1
* | | | make .qmake.{super,cache,conf} find "anchored" featuresOswald Buddenhagen2013-06-121-0/+2
* | | | find features/ under mkspecs/ of source & build rootOswald Buddenhagen2013-06-121-2/+6
* | | | add missing ifdeferyOswald Buddenhagen2013-06-124-3/+7