summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* Shouldn't call epocRoot() in non-epoc builds in generatePkgFileMiikka Heikkinen2010-04-191-1/+3
* Fixed installer_sis target for 4.7Miikka Heikkinen2010-04-191-4/+24
* Fix option(recursive)Miikka Heikkinen2010-04-191-1/+1
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-132-1/+3
|\
| * fix non-bootstrapped qmake buildOswald Buddenhagen2010-04-071-0/+2
| * comment out variable which is used only by commented out debug codeOswald Buddenhagen2010-04-071-1/+1
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-122-110/+62
|\ \ | |/ |/|
| * Improved support for OPTION and LINKEROPTION statements in MMP filesMiikka Heikkinen2010-04-122-110/+62
* | Added variable QMAKE_TARGET.arch to qmake to be used with MSVC++Zeno Albisser2010-04-061-0/+15
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-015-10/+8
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-015-10/+8
| |\ \
| | * | Cleanup the deployment codeThomas Zander2010-03-315-10/+8
* | | | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-04-011-2/+3
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-301-2/+3
| |\ \ \ | | |/ / | |/| |
| | * | Compile on Maemo 5Harald Fernengel2010-03-261-2/+3
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-301-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-03-3039-2634/+1533
| |\ \ \ | | |_|/ | |/| |
| | * | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-251-2/+3
| | |\ \ | | | |/
| | * | cetest build fixJoerg Bornemann2010-03-251-0/+2
* | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-292-12/+43
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Enable armcc version specific compler options for SymbianMiikka Heikkinen2010-03-261-0/+10
| * | Made it possible to define more than one language using pkg_prerulesMiikka Heikkinen2010-03-241-12/+32
| * | Changed Symbian pkg files to deploy from under epoc32Miikka Heikkinen2010-03-231-3/+18
* | | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-03-1919-876/+1220
|\ \ \ | | |/ | |/|
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60axis2010-03-182-0/+4
| |\ \ | | |/
| | * Fixed recursive QMAKE_EXTRA_TARGETS for symbian makefiles.Rohan McGovern2010-03-182-0/+4
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-1719-876/+1216
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-1719-876/+1216
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-165-15/+80
| | | |\ \
| | | * | | Moved UID2 processing from cpp code to profiles.axis2010-03-151-17/+1
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-1124-189/+271
| | | |\ \ \
| | | * | | | Enabled dependencies for .dso and .lib libraries only.axis2010-03-091-1/+3
| | | * | | | Merge branch 'defFilesAndMisc'axis2010-03-081-0/+4
| | | |\ \ \ \
| | | | * | | | Added dso dependencies to Symbian targets.axis2010-03-021-0/+4
| | | * | | | | Fix src!=build issueThomas Zander2010-03-041-1/+2
| | | * | | | | Merge branch 'master' into gcceThomas Zander2010-03-0221-372/+243
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Corrected a mismerge by Git.axis2010-03-011-1/+1
| | | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-0110-104/+147
| | | | |\ \ \ \
| | | | * | | | | Removed restrictions on file names from the Symbian makefile system.axis2010-02-264-9/+19
| | | | * | | | | Fixed a bug where the library extension would be embedded in pkg nameaxis2010-02-251-4/+12
| | | | * | | | | Added missing header after merge with master.axis2010-02-231-0/+3
| | | | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-2314-257/+64
| | | | |\ \ \ \ \
| | | * | | | | | | Make gcce xcompiler for symbian compile+link QtCoreThomas Zander2010-02-241-2/+2
| | | |/ / / / / /
| | | * | | | | | Fixed copy/paste error after commit a31e40295d.axis2010-02-231-1/+1
| | | * | | | | | Prevented pkg generation unless there are files to deploy.axis2010-02-221-1/+17
| | | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-195-134/+0
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-1816-1420/+23
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-165-32/+108
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-1212-64/+208
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Made some changes after code review.axis2010-02-123-5/+33
generated by cgit v0.12 at 2024-11-21 15:22:57 (GMT)