summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-081-1/+1
|\
| * Change the directory where smart-installable application package isMiikka Heikkinen2010-06-081-1/+1
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-06-082-3/+9
|\ \ | |/ |/|
| * support TARGETs with spacesOswald Buddenhagen2010-06-031-3/+3
| * qmake: don't warn about unknown MSVC compiler option /MPJoerg Bornemann2010-06-021-0/+6
* | Fixed def file usage for Qt plugins under the makefile build system.axis2010-06-045-37/+40
* | escape backslashes in QMAKE_PRL_LIBSOswald Buddenhagen2010-05-271-1/+1
* | complain about unescaped backslashesOswald Buddenhagen2010-05-262-0/+7
* | clarify wording of warning messageOswald Buddenhagen2010-05-201-1/+1
* | close scope while inside assignment only if the last char is a closing braceOswald Buddenhagen2010-05-201-1/+1
* | deprecate undocumented -E optionOswald Buddenhagen2010-05-201-0/+1
* | unify QMAKE_QMAKE path separator fixingOswald Buddenhagen2010-05-202-8/+6
* | simplify arcane conditional, once againOswald Buddenhagen2010-05-201-1/+1
* | Added support for .rc files on VS2010.Martin Petersson2010-05-201-2/+37
* | 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 branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-181-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | 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
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-194-30/+84
|\ \ \ \ | |/ / / |/| | |
| * | | 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 3 - unchanged source treeIain2010-05-141-2/+2
| * | | 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
| |/ /
* | | qmake/MinGw: Link statically.Friedemann Kleint2010-05-182-2/+3
|/ /
* | fix qmake project file following msvc2010 additionOswald Buddenhagen2010-05-061-3/+5
* | 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-026-70/+45
|\ \ \
| * | | bye bye QMakeProjectEnvOswald Buddenhagen2010-04-301-41/+5
| * | | short-cut evaluation inside if() testsOswald Buddenhagen2010-04-301-6/+3
| * | | eliminate special splitting of INCLUDEPATH and DEPENDPATHOswald Buddenhagen2010-04-301-5/+3
| * | | do not env-expand cache file pathOswald Buddenhagen2010-04-301-1/+1
| * | | s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/Oswald Buddenhagen2010-04-301-1/+1
| * | | s/INCPATH/INCLUDEPATH/Oswald Buddenhagen2010-04-301-2/+2
| * | | warn about usage of deprecated variablesOswald Buddenhagen2010-04-301-0/+5
| * | | warn about using non-lowercased replace $$function()sOswald Buddenhagen2010-04-301-1/+5
| * | | add -Wdeprecated option (on by default)Oswald Buddenhagen2010-04-302-3/+8