summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-011-0/+4
|\
| * Readd a line that got removed by accident in previous changeAndy Shaw2010-03-011-0/+1
| * Ensure that a library path with a space in it gets quoted on WindowsAndy Shaw2010-03-011-1/+4
* | Added .condition modifier to SUBDIRS.Miikka Heikkinen2010-03-011-1/+12
|/
* Allow overriding TARGET.EPOCHEAPSIZE with MMP_RULESMiikka Heikkinen2010-02-261-5/+5
* Fix SymbianMakefileGenerator::absolutizePath for clean buildsMiikka Heikkinen2010-02-251-3/+7
* Misc fixes to FLM filesMiikka Heikkinen2010-02-251-1/+1
* Fix extensions section in bld.inf when CONFIG contains symbian_testMiikka Heikkinen2010-02-244-7/+14
* Basic deployment support for ROM in SymbianMiikka Heikkinen2010-02-247-84/+144
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-222-23/+14
|\
| * Changed canonical paths to absolute paths in symmake.Miikka Heikkinen2010-02-222-23/+14
* | Fixed shadow builds on Unix.Rohan McGovern2010-02-221-1/+1
|/
* Fixed linkage failure when building qmake on Unix platformsGareth Stockwell2010-02-191-2/+0
* Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-1912-151/+40
* Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-197-100/+34
* Revert "Factored readRegistryKey implementation out of qmake"axis2010-02-197-34/+100
* Revert "Factored epocRoot implementation out of qmake"axis2010-02-1912-40/+151
* Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-1812-151/+40
* Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-187-100/+34
* Use correct (forward slash) separators in qmake-generated bld.infIain2010-02-171-1/+1
* Add make stub_sis target, and add webkit stub to qt.ibyShane Kearns2010-02-121-4/+30
* 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
|/
* 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