summaryrefslogtreecommitdiffstats
path: root/qmake/generators
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-021-1/+1
|\
| * s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/Oswald Buddenhagen2010-04-301-1/+1
* | Fix path removal from target in Symbian buildsMiikka Heikkinen2010-04-301-3/+6
|/
* fix nmake build with win32-msvc2010Joerg Bornemann2010-04-261-1/+1
* Fix all qmake Makefiles to include the MSBuild backendMarius Storm-Olsen2010-04-241-2/+2
* Add support for MSBuild, which is the project format for MSVC 2010Martin Petersson2010-04-2111-8/+5077
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-151-1/+3
|\
| * Shouldn't call epocRoot() in non-epoc builds in generatePkgFileMiikka Heikkinen2010-04-151-1/+3
* | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-151-1/+1
|\ \ | |/ |/|
| * Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-141-1/+1
| |\
| | * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-141-1/+1
| | |\
| | | * Export .flm files always if they are differentMiikka Heikkinen2010-04-131-1/+1
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-141-4/+24
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed installer_sis target for 4.7Miikka Heikkinen2010-04-141-4/+24
| |/ /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-121-17/+21
|\ \ \ | |/ / |/| |
| * | fix cetest build properlyJoerg Bornemann2010-04-121-17/+21
* | | 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
* | 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 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 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-1914-861/+1197
|\ \
| * \ 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-1714-861/+1193
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-1714-861/+1193
| | |\ \
| | | * \ 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-1117-40/+112
| | | |\ \ \
| | | * | | | 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-0212-362/+187
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Corrected a mismerge by Git.axis2010-03-011-1/+1
| | | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-018-103/+142
| | | | |\ \ \ \
| | | | * | | | | 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-237-248/+13
| | | | |\ \ \ \ \
| | | * | | | | | | 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-187-1375/+12
| | | |\ \ \ \ \ \ \