Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge branch 'merge-request-1601' into master-s60 | axis | 2010-01-05 | 4 | -23/+59 | |
| |\ \ | ||||||
| | * | | Improving parts of commit 2d8d855d. | axis | 2009-11-17 | 1 | -10/+20 | |
| | * | | qmake: add Linux host support to Symbian generator | Anderson Lizardo | 2009-11-17 | 4 | -23/+53 | |
* | | | | Merge branch '4.6' | Thiago Macieira | 2010-01-21 | 5 | -10/+44 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-01-20 | 1 | -1/+13 | |
| |\ \ \ | ||||||
| | * | | | Add command to qmake to do symbian-uid generation | Thomas Zander | 2010-01-20 | 1 | -1/+13 | |
| * | | | | Generic solution for plugin stub exports for IBY usage | Miikka Heikkinen | 2010-01-20 | 4 | -9/+31 | |
| |/ / / | ||||||
* | | | | Merge branch '4.6' | Thiago Macieira | 2010-01-18 | 1 | -8/+6 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Better fix for build!=src Makefile generation | Thomas Zander | 2010-01-14 | 1 | -5/+3 | |
| * | | | Fix rules for recreating the Makefile in a subdir | Thomas Zander | 2010-01-13 | 1 | -8/+8 | |
* | | | | Merge branch '4.6' | Thiago Macieira | 2010-01-13 | 49 | -49/+49 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-01-09 | 49 | -49/+49 | |
| |\ \ \ | ||||||
| | * \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6 | Jason McDonald | 2010-01-06 | 1 | -8/+5 | |
| | |\ \ \ | ||||||
| | * | | | | Update copyright year to 2010 | Jason McDonald | 2010-01-06 | 49 | -49/+49 | |
* | | | | | | Merge branch '4.6' | Thiago Macieira | 2010-01-12 | 1 | -6/+1 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Separated "make run" and "make runonphone" targets | Miikka Heikkinen | 2010-01-07 | 1 | -6/+1 | |
| | |/ / / | |/| | | | ||||||
* | | | | | 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 | 3 | -7/+18 | |
|\ \ \ | |/ / | ||||||
| * | | 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 | 3 | -7/+18 | |
* | | | Merge branch '4.6' | Thiago Macieira | 2009-10-16 | 3 | -346/+69 | |
|\ \ \ | |/ / | ||||||
| * | | Refactored SymbianSubdirsMetaMakefileGenerator out of qmake. | Miikka Heikkinen | 2009-10-16 | 3 | -346/+69 | |
* | | | Prevent cross-talk between different Qt builds on OS X. | Morten Sorvig | 2009-10-12 | 1 | -1/+0 | |
* | | | Patched qmake to try to resolve a directory argument in makefile mode. | J-P Nurmi | 2009-10-06 | 1 | -11/+25 | |
|/ / | ||||||
* | | 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 | |