summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | Merge branch '4.6'Thiago Macieira2010-01-081-8/+5
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch '4.6'Thiago Macieira2009-12-266-26/+97
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/4.6'Olivier Goffart2009-12-152-50/+111
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-12-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-11-256-52/+60
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-11-101-2/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-10-213-7/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-10-163-346/+69
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Prevent cross-talk between different Qt builds on OS X.Morten Sorvig2009-10-121-1/+0
| * | | | | | | | | | | | | | | | | Patched qmake to try to resolve a directory argument in makefile mode.J-P Nurmi2009-10-061-11/+25
* | | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-1212-64/+208
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Make generate uid3 (symbian) work on 64 bit host platform.Thomas Zander2010-02-081-1/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-091-2/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Streamlined smart installer package creation in SymbianMiikka Heikkinen2010-02-091-2/+33
| | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Added QMake directory to INCPATH so the compiler can find required headersConstantin Makshin2010-02-081-4/+10
| |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-051-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Add the QMAKE_FILE_EXT variable to extra compilers generation.Jocelyn Turcotte2010-02-041-0/+13
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fixed the location where bootstrap.sis is looked for.Miikka Heikkinen2010-02-041-1/+1
| * | | | | | | | | | | | | | | | Added support for smart installer package generation in SymbianMiikka Heikkinen2010-02-041-17/+69
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fixed QFileInfo::absolutePath() warning when running "qmake -project"Andreas Kling2010-02-031-1/+1
| * | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-028-41/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | qmake: subdirs template: make distclean target use QMAKE_DISTCLEANOswald Buddenhagen2010-02-011-0/+1
| | * | | | | | | | | | | | | | | qmake: fix warningsOswald Buddenhagen2010-02-016-24/+27
| | * | | | | | | | | | | | | | | qmake: Remove macro and simplify string expression previously using itOswald Buddenhagen2010-02-011-2/+3
| | * | | | | | | | | | | | | | | qmake: use isActiveConfig() instead of hand-crafting comparisonsOswald Buddenhagen2010-02-013-15/+15
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Added support for ifdeffing for manufacturer in generated pkg filesMiikka Heikkinen2010-01-281-0/+40
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Made some changes after code review.axis2010-02-123-5/+33
* | | | | | | | | | | | | | | More src!=builddir fixes for symbian makefile generatorThomas Zander2010-02-111-3/+10
* | | | | | | | | | | | | | | Place the generated pkg file in the build dir.Thomas Zander2010-02-101-3/+3
* | | | | | | | | | | | | | | Implemented rss file generator for Linux.axis2010-02-096-433/+499
* | | | | | | | | | | | | | | Implemented pkg generator for the symbian/linux-armcc mkspec.axis2010-02-0416-266/+479
* | | | | | | | | | | | | | | Fixed path separators in the plugin stub generator.axis2010-02-011-2/+2
* | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-2149-79/+173
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-201-1/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Add command to qmake to do symbian-uid generationThomas Zander2010-01-201-1/+13
| | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Generic solution for plugin stub exports for IBY usageMiikka Heikkinen2010-01-204-9/+31
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Better fix for build!=src Makefile generationThomas Zander2010-01-141-5/+3
| * | | | | | | | | | | | | Fix rules for recreating the Makefile in a subdirThomas Zander2010-01-131-8/+8
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-0949-49/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Jason McDonald2010-01-061-8/+5
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Update copyright year to 2010Jason McDonald2010-01-0649-49/+49
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Separated "make run" and "make runonphone" targetsMiikka Heikkinen2010-01-071-6/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Minor logic fix to Symbian generator in qmakeMiikka Heikkinen2010-01-051-7/+4
| * | | | | | | | | | Deal with test cases that crash or hangShane Kearns2010-01-041-1/+1
| |/ / / / / / / / /
| * | | | | | | | | Changed make sis only require .make.cache if QT_SIS_TARGET is not set.Miikka Heikkinen2009-12-221-2/+4
| * | | | | | | | | Added more specific clean targets for Symbian buildsMiikka Heikkinen2009-12-222-3/+57
| * | | | | | | | | Tool for launching symbian apps on the phone from windows command lineShane Kearns2009-12-214-10/+22
* | | | | | | | | | Better fix for build!=src Makefile generationThomas Zander2010-01-191-5/+3