summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1753-53/+53
|\
| * Update copyright year to 2011.Jason McDonald2011-01-1053-53/+53
* | qmake: fix wrong case label in toString(subSystemOption)Joerg Bornemann2011-01-101-4/+0
* | qmake: write and install pkg-config files for mingwMark Brand2011-01-102-0/+15
* | qmake: don't limit pkg-config writing to unix generatorMark Brand2011-01-104-182/+183
* | qmake: fix double directory separatorMark Brand2011-01-101-2/+7
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-052-0/+50
|\ \ | |/
| * Generate freeze targets in SymbianMiikka Heikkinen2011-01-042-0/+50
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-231-1/+1
|\ \ | |/
| * Fix infinite loop in qmake when reading malformed .ts files.Miikka Heikkinen2010-12-221-1/+1
* | Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-145-17/+79
|\ \
| * \ Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-075-17/+79
| |\ \
| | * \ Merge remote branch 'origin/master' into file-engine-refactorJoão Abecasis2010-12-0219-303/+427
| | |\ \
| | * \ \ Merge remote branch 'qt/master' into file-engine-refactorJoão Abecasis2010-11-2315-38/+121
| | |\ \ \
| | * | | | Fix qmake compilation on *nix platformsJoão Abecasis2010-10-221-1/+1
| | * | | | Use QSystemError to return errors from QFileSystemEngineShane Kearns2010-10-125-1/+16
| | * | | | Merge remote branch 'qt/master' into earth/file-engine-refactorShane Kearns2010-10-0810-185/+102
| | |\ \ \ \
| | * | | | | Compile fixes for mingwPrasanth Ullattil2010-10-071-0/+4
| | * | | | | Merge commit 'origin/master' into fileEnginesThomas Zander2010-10-062-3/+11
| | |\ \ \ \ \
| | * | | | | | Compile fixes for windowsPrasanth Ullattil2010-09-291-1/+0
| | * | | | | | Merge commit 'origin/master' into fileEnginesOn47Thomas Zander2010-09-2817-592/+637
| | |\ \ \ \ \ \
| | * | | | | | | Make QDirIterator cheaper when constructed with a QDirThomas Zander2010-09-221-0/+1
| | * | | | | | | Implement QFileSystemIterator for windows.Prasanth Ullattil2010-09-154-14/+1
| | * | | | | | | Refactored QFSFileEngineIterator/UnixJoão Abecasis2010-09-102-6/+3
| | * | | | | | | QFileSystemEngine/Mac: keep it empty until neededJoão Abecasis2010-09-032-0/+5
| | * | | | | | | Adding minimal QFileSystemIterator APIJoão Abecasis2010-08-315-4/+20
| | * | | | | | | Move canonicalPath() to the new qfilesystemengine_unixThomas Zander2010-08-304-1/+15
| | * | | | | | | Adding QFileSystemEntry and QFileSystemEngine to build systemJoão Abecasis2010-08-305-2/+37
* | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-131-2/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | fix path separator matchingOswald Buddenhagen2010-12-101-2/+2
* | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-063-12/+26
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | / / / / / / / | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix misleading uppercasing deprecation warningOswald Buddenhagen2010-12-031-3/+2
| * | | | | | | Remove unused variableMiikka Heikkinen2010-11-261-1/+0
| * | | | | | | Fix QTBUG-13928 non flat mode for project files in VS2010.Martin Petersson2010-11-251-7/+24
* | | | | | | | Changed various DEPLOYMENT variable ".sources" suffixes to ".files"Miikka Heikkinen2010-12-021-2/+2
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | 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