Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge branch '4.6' | Thiago Macieira | 2010-01-08 | 1 | -8/+5 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | / / / / / | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Minor logic fix to Symbian generator in qmake | Miikka Heikkinen | 2010-01-05 | 1 | -7/+4 | |
| * | | | | | | Deal with test cases that crash or hang | Shane Kearns | 2010-01-04 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge branch '4.6' | Thiago Macieira | 2009-12-26 | 6 | -26/+97 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Changed make sis only require .make.cache if QT_SIS_TARGET is not set. | Miikka Heikkinen | 2009-12-22 | 1 | -2/+4 | |
| * | | | | | Added more specific clean targets for Symbian builds | Miikka Heikkinen | 2009-12-22 | 2 | -3/+57 | |
| * | | | | | Tool for launching symbian apps on the phone from windows command line | Shane Kearns | 2009-12-21 | 4 | -10/+22 | |
| | |_|_|/ | |/| | | | ||||||
| * | | | | Merge remote branch 'staging/4.6' into 4.6 | Simon Hausmann | 2009-12-17 | 2 | -2/+5 | |
| |\ \ \ \ | ||||||
| | * | | | | Fixes: Ensure QMAKE_LFLAGS+=/MACHINE:X64 works for vcproj files | Andy Shaw | 2009-12-16 | 2 | -2/+5 | |
| * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60 | axis | 2009-12-11 | 1 | -1/+1 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| * | | | | | Fixed "make run" target for targets with special characters in them. | Miikka Heikkinen | 2009-12-10 | 2 | -13/+13 | |
* | | | | | | Merge commit 'origin/4.6' | Olivier Goffart | 2009-12-15 | 2 | -50/+111 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | Merge oslo-staging-2/4.6 into upstream/4.6 | Olivier Goffart | 2009-12-09 | 2 | -50/+111 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | MMP_RULES overriding qmake variables now warns user | Miikka Heikkinen | 2009-12-04 | 2 | -50/+111 | |
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-12-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Apparently fixes some build issues on some old unixes... | Pierre Rossi | 2009-12-04 | 1 | -1/+1 | |
| |/ / / / | ||||||
* | | | | | Merge branch '4.6' | Thiago Macieira | 2009-11-25 | 6 | -52/+60 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Fix ICON keyword to work with absolute paths also in SBSv2. | Janne Anttila | 2009-11-20 | 1 | -1/+4 | |
| * | | | | Changed MIF filename from UID to target name in Symbian. | Janne Anttila | 2009-11-18 | 6 | -17/+22 | |
| * | | | | Remove temp dirs workaround for raptor builds only | Shane Kearns | 2009-11-09 | 6 | -34/+34 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge branch '4.6' | Thiago Macieira | 2009-11-10 | 1 | -2/+42 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Initial LFLAGS support for qmake on Symbian OS | Iain | 2009-11-05 | 1 | -2/+42 | |
* | | | | Merge branch '4.6' | Thiago Macieira | 2009-10-21 | 2 | -6/+13 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Revert "Switch from *-armv5 to *-armv6." | Frans Englich | 2009-10-21 | 2 | -6/+6 | |
| * | | | Switch from *-armv5 to *-armv6. | Frans Englich | 2009-10-21 | 2 | -6/+6 | |
| | |/ | |/| | ||||||
| * | | Ensure qmake does not lose the error code when going over the subdirs | Andy Shaw | 2009-10-20 | 2 | -6/+13 | |
* | | | Merge branch '4.6' | Thiago Macieira | 2009-10-16 | 2 | -323/+45 | |
|\ \ \ | |/ / | ||||||
| * | | Refactored SymbianSubdirsMetaMakefileGenerator out of qmake. | Miikka Heikkinen | 2009-10-16 | 2 | -323/+45 | |
* | | | Prevent cross-talk between different Qt builds on OS X. | Morten Sorvig | 2009-10-12 | 1 | -1/+0 | |
|/ / | ||||||
* | | Enable overriding TARGETTYPE and OPTION statements with MMP_RULES | Miikka Heikkinen | 2009-10-02 | 2 | -19/+58 | |
* | | Revert "qmake - add error message if files for deployment are missing" | Joerg Bornemann | 2009-10-01 | 1 | -8/+2 | |
|/ | ||||||
* | Support for generating OPTION GCCE from QMAKE_CXXFLAGS.GCCE | Shane Kearns | 2009-09-22 | 1 | -3/+21 | |
* | Fix qmake pkg file generator to respect a drive specified for binaries | Shane Kearns | 2009-09-22 | 1 | -2/+7 | |
* | Update license headers again. | Jason McDonald | 2009-09-09 | 38 | -152/+152 | |
* | Renamed make 'sisx' target to 'sis' and QT_SISX_* variables to QT_SIS_* | Janne Anttila | 2009-09-03 | 4 | -25/+25 | |
* | Update tech preview license header for files that are new in 4.6. | Jason McDonald | 2009-08-31 | 9 | -117/+117 | |
* | Merge branch '4.5' into 4.6 | Thiago Macieira | 2009-08-31 | 29 | -377/+377 | |
|\ | ||||||
| * | Update tech preview license header. | Jason McDonald | 2009-08-31 | 29 | -377/+377 | |
| * | Update license headers. | Jason McDonald | 2009-08-11 | 29 | -29/+29 | |
* | | Merge branch 'master' into 4.6 | Janne Anttila | 2009-08-31 | 1 | -1/+1 | |
|\ \ | ||||||
| * \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Janne Anttila | 2009-08-28 | 1 | -1/+1 | |
| |\ \ | ||||||
| * | | | Updated docs to reflect current 'createpackage' and 'make sisx' syntax. | Janne Anttila | 2009-08-28 | 1 | -1/+1 | |
* | | | | Merge branch 'master' into 4.6 | Janne Anttila | 2009-08-28 | 6 | -62/+133 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Minor fix to space usage in makefile. | Janne Anttila | 2009-08-28 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Changed createpackage parameters to be more consistent with make targets. | Janne Anttila | 2009-08-28 | 2 | -6/+11 | |
| * | | Minor fix to MAKEFILE variable in SBSv2 generated makefiles. | Janne Anttila | 2009-08-28 | 1 | -4/+1 | |
| * | | Various small fixes and cleanups for symbian qmake generator. | Janne Anttila | 2009-08-28 | 3 | -37/+40 | |
| * | | Bug fix for store_build target when using subdirs project template. | Janne Anttila | 2009-08-27 | 1 | -2/+4 | |
| * | | Fixed createpackage.bat params to be more consistent with make targets. | Janne Anttila | 2009-08-27 | 1 | -1/+1 | |
| * | | Added support for 'make sisx' target in Symbian OS. | Janne Anttila | 2009-08-27 | 5 | -4/+79 | |