summaryrefslogtreecommitdiffstats
path: root/qmake/generators
Commit message (Expand)AuthorAgeFilesLines
* Update license headers again.Jason McDonald2009-09-0938-152/+152
* Renamed make 'sisx' target to 'sis' and QT_SISX_* variables to QT_SIS_*Janne Anttila2009-09-034-25/+25
* Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-319-117/+117
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-3129-377/+377
|\
| * Update tech preview license header.Jason McDonald2009-08-3129-377/+377
| * Update license headers.Jason McDonald2009-08-1129-29/+29
* | Merge branch 'master' into 4.6Janne Anttila2009-08-311-1/+1
|\ \
| * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Anttila2009-08-281-1/+1
| |\ \
| * | | Updated docs to reflect current 'createpackage' and 'make sisx' syntax.Janne Anttila2009-08-281-1/+1
* | | | 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
* | | Fix obsolete license headers.Jason McDonald2009-08-211-1/+1
|/ /
* | 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-194-2/+192
|/ / /
* | | Review fixes to qmakeMiikka Heikkinen2009-08-187-98/+17
* | | Merge commit 'qt/master'Jason Barron2009-08-188-14/+28
|\ \ \ | |/ /
| * | 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-1329-29/+29
|\ \ \ | |/ /
| * | Update contact URL in license headers.Jason McDonald2009-08-1229-29/+29
* | | Merge commit 'qt/master-stable'Jason Barron2009-08-101-1/+7
|\ \ \ | |/ /
| * | qmake - add error message if files for deployment are missingThomas Hartmann2009-08-071-1/+7
* | | Fixed target name corruption in symmakeMiikka Heikkinen2009-08-071-3/+3
* | | Update license headers according to commit 858c70f768e.axis2009-08-068-20/+20
* | | Replaced $MODULE$ with hardcoded module names.axis2009-08-068-8/+8
* | | 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-065-91/+63
|\ \ \ \ | |/ / /
| * | | Merge commit 'origin/master'Jason Barron2009-08-049-252/+230
| |\ \ \
| * \ \ \ Merge commit 'qt/master-stable'Jason Barron2009-08-042-12/+10
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Port of Qt to QNXHarald Fernengel2009-07-292-12/+10
| * | | | Merge commit 'qt/master-stable'Jason Barron2009-07-291-8/+6
| |\ \ \ \ | | |/ / /
| | * | | Fix qmake dependency generation for include statements with local files.Simon Hausmann2009-07-271-8/+6
| * | | | Merge commit 'qt/master-stable'Jason Barron2009-07-273-71/+47
| |\ \ \ \ | | |/ / /