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-191-0/+1
|\
| * Merge remote branch 'origin/4.7' into HEADOlivier Goffart2010-05-191-4/+17
| |\
| * | Added a default value for optimization settings.Martin Petersson2010-05-181-0/+1
* | | Merge commit 'remotes/origin/4.7' into symbian47Thomas Zander2010-05-191-4/+17
|\ \ \ | | |/ | |/|
| * | Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-05-191-3/+16
| |\ \
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-171-3/+16
| | |\ \
| | | * | qmake: added possibility to specify the type of an install targetJoerg Bornemann2010-05-171-3/+16
| * | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-171-1/+1
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | fix path separators in install targets for MinGW+shJoerg Bornemann2010-05-141-1/+1
| | |/
* | | Fix build break in SymbianMiikka Heikkinen2010-05-192-2/+2
* | | Fix pkg_prerules handling for installer packagesMiikka Heikkinen2010-05-181-5/+0
* | | Fix generation of stub sis filesShane Kearns2010-05-141-14/+69
* | | Shadow building on Symbian fixes: part 1 - files to right placeIain2010-05-143-16/+14
* | | Fix requires keyword handling in qmake in SymbianMiikka Heikkinen2010-05-141-0/+6
|/ /
* | remove extraneous return statementOswald Buddenhagen2010-05-061-1/+0
* | cosmetics: change enum valueOswald Buddenhagen2010-05-061-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-023-41/+32
|\ \
| * | Fix project file generation for MSVC 2010Martin Petersson2010-04-302-3/+32
| * | qmake: remove useless evaluation of variables from VS project generatorsJoerg Bornemann2010-04-292-16/+0
| * | qmake: fix duplicate linker options in VS project filesJoerg Bornemann2010-04-292-14/+0
| * | qmake: fix duplicate compiler options in VS project filesJoerg Bornemann2010-04-292-8/+0
* | | 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