summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 4.6Janne Anttila2009-08-286-62/+133
|\
| * Minor fix to space usage in makefile.Janne Anttila2009-08-281-1/+1
| * Changed createpackage parameters to be more consistent with make targets.Janne Anttila2009-08-282-6/+11
| * Minor fix to MAKEFILE variable in SBSv2 generated makefiles.Janne Anttila2009-08-281-4/+1
| * Various small fixes and cleanups for symbian qmake generator.Janne Anttila2009-08-283-37/+40
| * Bug fix for store_build target when using subdirs project template.Janne Anttila2009-08-271-2/+4
| * Fixed createpackage.bat params to be more consistent with make targets.Janne Anttila2009-08-271-1/+1
| * Added support for 'make sisx' target in Symbian OS.Janne Anttila2009-08-275-4/+79
| * Support for template PKG file.Janne Anttila2009-08-273-19/+8
* | Remove last vestiges of the qtusagereporter.Jason McDonald2009-08-241-11/+0
* | Fix obsolete license headers.Jason McDonald2009-08-211-1/+1
|/
* Merge commit 'qt/master'Jason Barron2009-08-218-806/+14
|\
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-201-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
| |\ \
| * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-185-15/+15
| |\ \ \
| * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-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
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-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
| |\ \ \ \ \ \ \
| * | | | | | | | 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
generated by cgit v0.12 at 2024-11-15 14:50:14 (GMT)