aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/1.2'Joerg Bornemann2014-07-0211-22/+96
|\
| * Remove executable bit from non-executable files.v1.2.21.2Jake Petroules2014-06-165-0/+0
| * fix scope chain of conditions of Properties itemsJoerg Bornemann2014-06-163-21/+88
| * fix isEmpty checkJoerg Bornemann2014-06-161-1/+1
| * fix graph traversal of ArtifactVisitorJoerg Bornemann2014-06-132-0/+7
* | revisit how Qt compiler defines are set upJoerg Bornemann2014-07-025-10/+28
* | Yet another timeout increase for the "infinite loop" autotest.Christian Kandeler2014-07-021-2/+2
* | Make sure to remove empty parent directories when removing artifacts.Christian Kandeler2014-07-0213-11/+221
* | Fix exception leak in JS command execution.Christian Kandeler2014-07-021-5/+20
* | Use the same environment in Loader and BuildGraphLoader.Christian Kandeler2014-07-024-17/+15
* | Correctly handle overriding of file tags via an empty list.Christian Kandeler2014-07-027-4/+23
* | Do not lose rescuable artifact data after an incomplete build.Christian Kandeler2014-07-027-3/+126
* | Add failing autotest for QBS-635.Christian Kandeler2014-06-265-0/+20
* | qbs project files: Move property appInstallDir all the way up.Christian Kandeler2014-06-252-1/+1
* | Be more verbose about changed environment.Christian Kandeler2014-06-241-3/+6
* | Command-line frontend: Make plugin and search paths configurable.Christian Kandeler2014-06-244-7/+12
* | Let sub-projects inherit the buildDirectory property.Christian Kandeler2014-06-191-1/+2
* | Fix Qt4 include paths.Christian Kandeler2014-06-191-4/+8
* | beautify string template syntaxJoerg Bornemann2014-06-185-13/+13
* | revisit how Qt includePaths are set upJoerg Bornemann2014-06-186-71/+117
* | fix appWithoutSources test on OS XJoerg Bornemann2014-06-161-0/+1
* | prevent writing of mixed line endings in ProjectFileUpdaterJoerg Bornemann2014-06-162-2/+60
* | fix build directory checks in autotestsJoerg Bornemann2014-06-161-2/+2
* | use toJSLiteral in setupQtProfileJoerg Bornemann2014-06-162-22/+18
* | make toJSLiteral functions available in command line toolsJoerg Bornemann2014-06-164-31/+33
* | fix QtModule.qbsJoerg Bornemann2014-06-161-0/+1
* | remove unused properties from Qt module filesJoerg Bornemann2014-06-132-3/+0
* | Merge remote-tracking branch 'origin/1.2'Joerg Bornemann2014-06-133-2/+13
|\|
| * sanitize stdout/stderr output in blackbox testJoerg Bornemann2014-06-132-0/+9
| * allow Probe items within Module itemsJoerg Bornemann2014-06-131-0/+1
| * fix TestBlackbox::erroneousFiles on *nixJoerg Bornemann2014-06-131-2/+3
* | remove superfluous ANGLE code from Qt.gui module templateJoerg Bornemann2014-06-121-3/+0
* | centralize input(s) property setupJoerg Bornemann2014-06-113-38/+3
* | provide missing input properties for multiplex rulesJoerg Bornemann2014-06-111-0/+44
* | Merge remote-tracking branch 'origin/1.2'Joerg Bornemann2014-06-104-0/+52
|\|
| * yield error if Command.workingDirectory doesn't existJoerg Bornemann2014-06-104-0/+52
* | fix TestBlackbox::usingsAsSoleInputsNonMultiplexedJoerg Bornemann2014-06-062-3/+3
* | show error location in Rule.ArtifactJoerg Bornemann2014-06-055-5/+11
* | simplify Transformer::setup{In|Out}putsJoerg Bornemann2014-06-051-8/+6
* | Merge remote-tracking branch 'origin/1.2'Joerg Bornemann2014-06-054-9/+23
|\|
| * fix linking of static Qt libsJoerg Bornemann2014-06-051-3/+10
| * fix lib name for static Qt libs on OS XJoerg Bornemann2014-06-041-1/+1
| * read QtModuleInfo.isStaticLibrary from module_configJoerg Bornemann2014-06-041-1/+6
| * initialize QtModuleInfo::isStaticLibraryJoerg Bornemann2014-06-041-1/+3
| * Fix messages.Takumi Asaki2014-06-022-3/+3
* | remove superfluous includeJoerg Bornemann2014-06-051-1/+0
* | Added an API to retrieve the current run/build environmentThomas Epting2014-06-052-0/+15
* | Merge "Merge remote-tracking branch 'origin/1.2'"Christian Kandeler2014-06-027-19/+58
|\ \
| * | Merge remote-tracking branch 'origin/1.2'Joerg Bornemann2014-06-027-19/+58
| |\|
| | * setup-qt: mark ActiveQt libs as static for Qt4Joerg Bornemann2014-05-261-1/+9