| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-05-02 | 3 | -41/+32 |
|\ |
|
| * | Fix project file generation for MSVC 2010 | Martin Petersson | 2010-04-30 | 2 | -3/+32 |
|
|
| * | qmake: remove useless evaluation of variables from VS project generators | Joerg Bornemann | 2010-04-29 | 2 | -16/+0 |
|
|
| * | qmake: fix duplicate linker options in VS project files | Joerg Bornemann | 2010-04-29 | 2 | -14/+0 |
|
|
| * | qmake: fix duplicate compiler options in VS project files | Joerg Bornemann | 2010-04-29 | 2 | -8/+0 |
|
|
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-05-02 | 6 | -70/+45 |
|\ \ |
|
| * | | bye bye QMakeProjectEnv | Oswald Buddenhagen | 2010-04-30 | 1 | -41/+5 |
|
|
| * | | short-cut evaluation inside if() tests | Oswald Buddenhagen | 2010-04-30 | 1 | -6/+3 |
|
|
| * | | eliminate special splitting of INCLUDEPATH and DEPENDPATH | Oswald Buddenhagen | 2010-04-30 | 1 | -5/+3 |
|
|
| * | | do not env-expand cache file path | Oswald Buddenhagen | 2010-04-30 | 1 | -1/+1 |
|
|
| * | | s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/ | Oswald Buddenhagen | 2010-04-30 | 1 | -1/+1 |
|
|
| * | | s/INCPATH/INCLUDEPATH/ | Oswald Buddenhagen | 2010-04-30 | 1 | -2/+2 |
|
|
| * | | warn about usage of deprecated variables | Oswald Buddenhagen | 2010-04-30 | 1 | -0/+5 |
|
|
| * | | warn about using non-lowercased replace $$function()s | Oswald Buddenhagen | 2010-04-30 | 1 | -1/+5 |
|
|
| * | | add -Wdeprecated option (on by default) | Oswald Buddenhagen | 2010-04-30 | 2 | -3/+8 |
|
|
| * | | make QMakeProject::isEmpty() consider legacy mappings | Oswald Buddenhagen | 2010-04-30 | 2 | -3/+6 |
|
|
| * | | document some functions' scope | Oswald Buddenhagen | 2010-04-30 | 1 | -5/+5 |
|
|
| * | | fix $$size() not using function-scoped variables | Oswald Buddenhagen | 2010-04-30 | 1 | -2/+1 |
| |/ |
|
* | | Fix path removal from target in Symbian builds | Miikka Heikkinen | 2010-04-30 | 1 | -3/+6 |
|/ |
|
* | fix nmake build with win32-msvc2010 | Joerg Bornemann | 2010-04-26 | 1 | -1/+1 |
|
|
* | Fix all qmake Makefiles to include the MSBuild backend | Marius Storm-Olsen | 2010-04-24 | 4 | -8/+26 |
|
|
* | Add support for MSBuild, which is the project format for MSVC 2010 | Martin Petersson | 2010-04-21 | 13 | -12/+5090 |
|
|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-04-18 | 1 | -4/+1 |
|\ |
|
| * | do not expand variables in read()'s file name | Oswald Buddenhagen | 2010-04-16 | 1 | -2/+1 |
|
|
| * | remove ability to use break() a block outside any loop | Oswald Buddenhagen | 2010-04-16 | 1 | -2/+0 |
|
|
* | | Fix option(recursive) | Miikka Heikkinen | 2010-04-15 | 1 | -1/+1 |
|/ |
|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-04-15 | 1 | -1/+3 |
|\ |
|
| * | Shouldn't call epocRoot() in non-epoc builds in generatePkgFile | Miikka Heikkinen | 2010-04-15 | 1 | -1/+3 |
|
|
* | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-04-15 | 2 | -1/+2 |
|\ \
| |/
|/| |
|
| * | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-04-14 | 2 | -1/+2 |
| |\ |
|
| | * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-04-14 | 2 | -1/+2 |
| | |\ |
|
| | | * | Export .flm files always if they are different | Miikka Heikkinen | 2010-04-13 | 1 | -1/+1 |
|
|
| | | * | Make qmake possible to build with mingw using qmake.pro | Miikka Heikkinen | 2010-04-13 | 1 | -0/+1 |
|
|
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-04-14 | 1 | -4/+24 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Fixed installer_sis target for 4.7 | Miikka Heikkinen | 2010-04-14 | 1 | -4/+24 |
| |/ / |
|
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-04-13 | 2 | -19/+21 |
|\ \ \
| |/ /
|/| | |
|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-04-12 | 2 | -19/+21 |
| |\ \ |
|
| | * | | fix cetest build properly | Joerg Bornemann | 2010-04-12 | 2 | -19/+21 |
|
|
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-04-13 | 2 | -1/+3 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | fix non-bootstrapped qmake build | Oswald Buddenhagen | 2010-04-07 | 1 | -0/+2 |
|
|
| * | | | comment out variable which is used only by commented out debug code | Oswald Buddenhagen | 2010-04-07 | 1 | -1/+1 |
| |/ / |
|
* | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-04-12 | 2 | -110/+62 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | Improved support for OPTION and LINKEROPTION statements in MMP files | Miikka Heikkinen | 2010-04-12 | 2 | -110/+62 |
|
|
* | | Added variable QMAKE_TARGET.arch to qmake to be used with MSVC++ | Zeno Albisser | 2010-04-06 | 1 | -0/+15 |
|
|
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-04-01 | 5 | -10/+8 |
|\ \ |
|
| * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-04-01 | 5 | -10/+8 |
| |\ \ |
|
| | * | | Cleanup the deployment code | Thomas Zander | 2010-03-31 | 5 | -10/+8 |
|
|
* | | | | Merge remote branch 'origin/4.7' into 4.7 | Olivier Goffart | 2010-04-01 | 1 | -2/+3 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-30 | 1 | -2/+3 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | Compile on Maemo 5 | Harald Fernengel | 2010-03-26 | 1 | -2/+3 |
|
|