summaryrefslogtreecommitdiffstats
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-102-5/+16
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-07-305-22/+12
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backendKent Hansen2009-07-289-48/+81
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backendKent Hansen2009-07-144-53/+21
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backendKent Hansen2009-06-2940-80/+86
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Import JSC-based Qt Script from Kent's tree.Simon Hausmann2009-06-165-648/+5
* | | | | | | | | | | | | | | Merge commit 'qt/master'Jason Barron2009-08-201-11/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Make the license test pass.Frans Englich2009-08-191-11/+8
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Add support for LIBS_PRIVATE to the Symbian generators.Jason Barron2009-08-201-1/+2
* | | | | | | | | | | | | | Fixed compile warning in qmakeMiikka Heikkinen2009-08-201-1/+1
* | | | | | | | | | | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-199-9/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-191-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Add support for LIBS_PRIVATE to the VCProject generator too.Thiago Macieira2009-08-181-1/+3
| | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Changed names and URLs to reflect name change.axis2009-08-198-8/+8
* | | | | | | | | | | | | | Review fixes for qmake (project.cpp cleanup)Miikka Heikkinen2009-08-197-172/+197
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Review fixes to qmakeMiikka Heikkinen2009-08-1812-814/+17
* | | | | | | | | | | | | Merge commit 'qt/master'Jason Barron2009-08-1813-29/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | CompileAnders Bakken2009-08-174-14/+14
| * | | | | | | | | | | | Rename qlistdata.cpp (back) to qlist.cpp.Volker Hilsheimer2009-08-171-1/+1
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | Add LIBS_PRIVATE to qmake.Thiago Macieira2009-08-178-13/+27
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | Set the QMAKE_BUNDLE_LOCATION to 'Contents/MacOS' only if it's not setTor Arne Vestbø2009-08-141-1/+1
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge commit 'qt/master'Jason Barron2009-08-1340-40/+40
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Update contact URL in license headers.Jason McDonald2009-08-1240-40/+40
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge commit 'qt/master'Jason Barron2009-08-101-4/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtKeith Isdale2009-08-101-1/+7
| |\ \ \ \ \ \ \ \
| * | | | | | | | | In a .pro file the include() function does not warn if specified fileKeith Isdale2009-08-101-4/+9
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge commit 'qt/master-stable'Jason Barron2009-08-103-2/+11
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | qmake - add error message if files for deployment are missingThomas Hartmann2009-08-071-1/+7
| |/ / / / / / /
| * | | | | | | 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
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Fixed target name corruption in symmakeMiikka Heikkinen2009-08-071-3/+3
* | | | | | | Update license headers according to commit 858c70f768e.axis2009-08-0610-26/+26
* | | | | | | Replaced $MODULE$ with hardcoded module names.axis2009-08-0610-10/+10
* | | | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-062-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix WebKit compilation outside of Qt with SBS.Simon Hausmann2009-08-061-0/+1
| * | | | | | | Fix WebKit compilation outside of Qt.Simon Hausmann2009-08-061-0/+1
* | | | | | | | Removed some commented out code from qmakeMiikka Heikkinen2009-08-061-2/+0
* | | | | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-0614-121/+107
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge commit 'origin/master'Jason Barron2009-08-0416-285/+259
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit 'qt/master-stable'Jason Barron2009-08-045-22/+12
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Port of Qt to QNXHarald Fernengel2009-07-295-22/+12
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge commit 'qt/master-stable'Jason Barron2009-07-292-8/+7
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | 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
| * | | | | | | Merge commit 'qt/master-stable'Jason Barron2009-07-2710-91/+88
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | 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