summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | make QMakeProject::isEmpty() consider legacy mappingsOswald Buddenhagen2010-04-302-3/+6
| * | document some functions' scopeOswald Buddenhagen2010-04-301-5/+5
| * | fix $$size() not using function-scoped variablesOswald Buddenhagen2010-04-301-2/+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-244-8/+26
* Add support for MSBuild, which is the project format for MSVC 2010Martin Petersson2010-04-2113-12/+5090
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-181-4/+1
|\
| * do not expand variables in read()'s file nameOswald Buddenhagen2010-04-161-2/+1
| * remove ability to use break() a block outside any loopOswald Buddenhagen2010-04-161-2/+0
* | Fix option(recursive)Miikka Heikkinen2010-04-151-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-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-152-1/+2
|\ \ | |/ |/|
| * Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-142-1/+2
| |\
| | * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-142-1/+2
| | |\
| | | * Export .flm files always if they are differentMiikka Heikkinen2010-04-131-1/+1
| | | * Make qmake possible to build with mingw using qmake.proMiikka Heikkinen2010-04-131-0/+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-132-19/+21
|\ \ \ | |/ / |/| |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-122-19/+21
| |\ \
| | * | fix cetest build properlyJoerg Bornemann2010-04-122-19/+21
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-132-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | fix non-bootstrapped qmake buildOswald Buddenhagen2010-04-071-0/+2
| * | | comment out variable which is used only by commented out debug codeOswald Buddenhagen2010-04-071-1/+1
| |/ /
* | | 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
* | Added variable QMAKE_TARGET.arch to qmake to be used with MSVC++Zeno Albisser2010-04-061-0/+15
* | 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
|\ \
| * \ 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