summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-251-2/+8
|\
| * fix performance penalty in Win32MakefileGenerator::findHighestVersionJoerg Bornemann2010-11-251-2/+8
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-11-2515-283/+378
|\ \ | |/ |/|
| * Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-2515-283/+378
| |\
| | * Use parent class function to generate Makefile headers in SymbianMiikka Heikkinen2010-11-232-20/+3
| | * Fixed namespace issues related to epocroot.cppMiikka Heikkinen2010-11-198-26/+26
| | * Resolve EPOCROOT in qt.conf using same logic as in .proMiikka Heikkinen2010-11-185-5/+6
| | * Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-181-1/+1
| | |\
| | * | Localize .loc and .pkg content based on TRANSLATIONSMiikka Heikkinen2010-11-127-233/+344
* | | | qmake/MinGW: do not copy .pdb files on "make install"Sean Harmer2010-11-254-18/+41
|/ / /
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-191-1/+1
|\ \ \ | | |/ | |/|
| * | qmake vcxproj generator: fix description of custom build toolsJoerg Bornemann2010-11-121-1/+1
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-121-2/+2
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-091-2/+2
| |\
| | * Doc: Fixing typoSergio Ahumada2010-11-091-2/+2
| * | Make qmake to pass all UTF-8 characters unchanged through parser.Miikka Heikkinen2010-11-081-1/+17
| * | Implement support for DEPLOYMENT.display_name in SymbianMiikka Heikkinen2010-11-081-7/+14
| * | Added .flags modifier support for DEPLOYMENT items in SymbianMiikka Heikkinen2010-11-083-9/+37
| * | Make default application deployment removableMiikka Heikkinen2010-11-081-81/+1
| * | Allow pkg_prerules and pkg_postrules to be targeted to separate filesMiikka Heikkinen2010-11-082-79/+167
| |/
* | Make qmake to pass all UTF-8 characters unchanged through parser.Miikka Heikkinen2010-11-041-1/+17
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-254-8/+8
|\ \ | |/
| * Fixed many spelling errors.Rohan McGovern2010-10-254-8/+8
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-253-5/+24
|\ \ | |/
| * qmake/symbian: Make sure the destination directory exists before copyingMartin Storsjo2010-10-181-0/+5
| * qmake/symbian: Don't give the -u flag to cp on Mac OS X, it isn't a standard ...Martin Storsjo2010-10-181-1/+4
| * Revert "qmake: pass include directories to MS resource compiler"Joerg Bornemann2010-10-133-4/+1
| * qmake: delete .pdb file when making 'distclean' instead of 'clean'Joerg Bornemann2010-10-111-1/+1
| * qmake: pass include directories to MS resource compilerJoerg Bornemann2010-10-113-1/+4
| * qmake/symbian: Add icons with backslashes in pkg filesMartin Storsjo2010-10-111-4/+4
| * Added missing native separator transforms.Bruno Abinader2010-10-082-3/+14
* | qmake: Add support for Clang-style precompiled headersTor Arne Vestbø2010-10-182-17/+56
* | Add manual test for mkspecs to visualize the effect of the final configTor Arne Vestbø2010-10-133-0/+3
* | Inconsistency with deployment keyword .sources and .files.Miikka Heikkinen2010-10-084-4/+10
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-10-073-97/+52
|\ \
| * | Implement support for DEPLOYMENT.display_name in SymbianMiikka Heikkinen2010-10-071-7/+14
| * | Added .flags modifier support for DEPLOYMENT items in SymbianMiikka Heikkinen2010-10-073-9/+37
| * | Make default application deployment removableMiikka Heikkinen2010-10-071-81/+1
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-077-88/+50
|\ \ \ | |/ / |/| / | |/
| * fix regexp in "make custom command handling in vc(x)proj files sane"Oswald Buddenhagen2010-10-061-1/+1
| * qmake: Include -pthread when reducing duplicate library argumentsTor Arne Vestbø2010-10-051-1/+1
| * qmake: Ensure right library order when reducing duplicate librariesTor Arne Vestbø2010-10-051-4/+6
| * make QMAKE_POST_LINK handling in nmake generator saneOswald Buddenhagen2010-10-051-4/+1
| * make custom command handling in vc(x)proj files saneOswald Buddenhagen2010-10-057-89/+50
* | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-042-3/+11
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-301-0/+1
| |\
| | * Improve Qt/Symbian compatibility with unix shellsMartin Storsjo2010-09-281-0/+1
| * | Streamlined smart installer package creationMiikka Heikkinen2010-09-271-3/+10
| |/
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-09-224-141/+280
|\ \
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-214-141/+280
| |\ \ | | |/