| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6 | Qt Continuous Integration System | 2010-02-09 | 1 | -17/+69 |
|\ |
|
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-02-05 | 1 | -0/+13 |
| |\ |
|
| | * | Add the QMAKE_FILE_EXT variable to extra compilers generation. | Jocelyn Turcotte | 2010-02-04 | 1 | -0/+13 |
|
|
| * | | Fixed the location where bootstrap.sis is looked for. | Miikka Heikkinen | 2010-02-04 | 1 | -1/+1 |
|
|
| * | | Added support for smart installer package generation in Symbian | Miikka Heikkinen | 2010-02-04 | 1 | -17/+69 |
| |/ |
|
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-04 | 1 | -0/+13 |
|\ \ |
|
| * | | Add the QMAKE_FILE_EXT variable to extra compilers generation. | Jocelyn Turcotte | 2010-02-04 | 1 | -0/+13 |
|
|
* | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Olivier Goffart | 2010-02-04 | 9 | -41/+87 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-02-03 | 1 | -1/+1 |
| |\ |
|
| | * | Fixed QFileInfo::absolutePath() warning when running "qmake -project" | Andreas Kling | 2010-02-03 | 1 | -1/+1 |
|
|
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int... | Qt Continuous Integration System | 2010-02-02 | 8 | -41/+46 |
| |\ \
| | |/
| |/| |
|
| | * | qmake: subdirs template: make distclean target use QMAKE_DISTCLEAN | Oswald Buddenhagen | 2010-02-01 | 1 | -0/+1 |
|
|
| | * | qmake: fix warnings | Oswald Buddenhagen | 2010-02-01 | 6 | -24/+27 |
|
|
| | * | qmake: Remove macro and simplify string expression previously using it | Oswald Buddenhagen | 2010-02-01 | 1 | -2/+3 |
|
|
| | * | qmake: use isActiveConfig() instead of hand-crafting comparisons | Oswald Buddenhagen | 2010-02-01 | 3 | -15/+15 |
|
|
| * | | Added support for ifdeffing for manufacturer in generated pkg files | Miikka Heikkinen | 2010-01-28 | 1 | -0/+40 |
| |/ |
|
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into mas... | Pulse Build System | 2010-01-22 | 4 | -23/+59 |
|\ \ |
|
| * \ | 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 |
|\ \ \
| |/ / |
|