summaryrefslogtreecommitdiff
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-201-11/+8
|\
| * Make the license test pass.Frans Englich2009-08-191-11/+8
* | remove QtScript from includepathKent Hansen2009-08-194-4/+1
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-191-1/+3
|\ \ | |/
| * Add support for LIBS_PRIVATE to the VCProject generator too.Thiago Macieira2009-08-181-1/+3
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-185-15/+15
|\ \ | |/
| * CompileAnders Bakken2009-08-174-14/+14
| * Rename qlistdata.cpp (back) to qlist.cpp.Volker Hilsheimer2009-08-171-1/+1
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-178-13/+27
|\ \ | |/
| * Add LIBS_PRIVATE to qmake.Thiago Macieira2009-08-178-13/+27
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-141-1/+1
|\ \ | |/
| * Set the QMAKE_BUNDLE_LOCATION to 'Contents/MacOS' only if it's not setTor Arne Vestbø2009-08-141-1/+1
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-1240-40/+40
|\ \ | |/
| * Update contact URL in license headers.Jason McDonald2009-08-1240-40/+40
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-102-5/+16
|\ \ | |/
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtKeith Isdale2009-08-101-1/+7
| |\
| | * qmake - add error message if files for deployment are missingThomas Hartmann2009-08-071-1/+7
| * | In a .pro file the include() function does not warn if specified fileKeith Isdale2009-08-101-4/+9
| |/
* | remove final traces of qtscript from qmakeKent Hansen2009-08-064-148/+3
* | merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-062-1/+4
|\ \ | |/
| * Add hints that a qmake generated .pro will need to be editedKeith Isdale2009-08-061-0/+3
| * Replace instances of weak linking for 10.3 with 10.4.Morten Sorvig2009-08-061-1/+1
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-07-305-22/+12
|\ \ | |/
| * Port of Qt to QNXHarald Fernengel2009-07-295-22/+12
* | Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backendKent Hansen2009-07-289-48/+81
|\ \ | |/
| * Fix qmake.pro so it can build qmake.Jason Barron2009-07-271-0/+1
| * Fix qmake dependency generation for include statements with local files.Simon Hausmann2009-07-271-8/+6
| * micro-optimization of some string operationsOswald Buddenhagen2009-07-171-18/+18
| * some directory separator cleanupOswald Buddenhagen2009-07-172-15/+21
| * Compile fix on windows.Denis Dzyubenko2009-07-163-6/+6
| * Changed the implementation of the unicode text codecs to share more code with...Denis Dzyubenko2009-07-165-1/+29
* | Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backendKent Hansen2009-07-144-53/+21
|\ \ | |/
| * fix bug in qmake DEPLOYMENT variableJoerg Bornemann2009-07-131-2/+1
| * qmake: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportMarius Storm-Olsen2009-07-013-49/+13
| * Merge branch '4.5'Thiago Macieira2009-06-241-2/+7
| |\
| | * Do not crash qmake if MAKEFILE_GENERATOR is not defined in a loaded .pr* fileKeith Isdale2009-06-241-2/+7
* | | Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backendKent Hansen2009-06-2940-80/+86
|\ \ \ | |/ /
| * | Merge license header changes from 4.5Volker Hilsheimer2009-06-1640-80/+86
| |\ \ | | |/
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-1640-80/+80
| | * disable stdout buffering alltogetherOswald Buddenhagen2009-06-161-6/+3
| | * Fixes crash of qmake on Windows Vista Business x64 (and undefinedRohan McGovern2009-06-161-0/+2
| | * Force line buffering for stdout so it stays in sync better with stderr (which...audiofanatic2009-06-151-0/+7
* | | Import JSC-based Qt Script from Kent's tree.Simon Hausmann2009-06-165-648/+5
|/ /
* | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-123-17/+5
|\ \ | |/
| * do not make PWD and OUT_PWD have trailing slashes upon returning from a SUBDI...Oswald Buddenhagen2009-06-111-6/+5
| * do not append trailing slash to OUT_PWD in nested pro-filesOswald Buddenhagen2009-06-111-2/+0
| * remove strange no-opOswald Buddenhagen2009-06-111-1/+0
| * remove dead codeOswald Buddenhagen2009-06-111-8/+0
* | Remove var->QMAKE_COMP_var docs, and mark feature unsupported.Marius Storm-Olsen2009-06-111-0/+1
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-081-1/+1
|\ \ | |/
View Lorry Controller Status