| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote branch 'origin/4.6' into 4.7-from-4.6 | Rohan McGovern | 2010-05-19 | 1 | -3/+16 |
|\ |
|
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-05-17 | 1 | -3/+16 |
| |\ |
|
| | * | qmake: added possibility to specify the type of an install target | Joerg Bornemann | 2010-05-17 | 1 | -3/+16 |
|
|
* | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Olivier Goffart | 2010-05-17 | 1 | -1/+1 |
|\ \ \
| |/ / |
|
| * | | fix path separators in install targets for MinGW+sh | Joerg Bornemann | 2010-05-14 | 1 | -1/+1 |
| |/ |
|
* | | remove extraneous return statement | Oswald Buddenhagen | 2010-05-06 | 1 | -1/+0 |
|
|
* | | cosmetics: change enum value | Oswald Buddenhagen | 2010-05-06 | 1 | -1/+1 |
|
|
* | | 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 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/ | Oswald Buddenhagen | 2010-04-30 | 1 | -1/+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 | 1 | -2/+2 |
|
|
* | | Add support for MSBuild, which is the project format for MSVC 2010 | Martin Petersson | 2010-04-21 | 11 | -8/+5077 |
|
|
* | | 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 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | 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 | 1 | -1/+1 |
| |\ \ |
|
| | * \ | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-04-14 | 1 | -1/+1 |
| | |\ \
| | | |/ |
|
| | | * | Export .flm files always if they are different | Miikka Heikkinen | 2010-04-13 | 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-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-12 | 1 | -17/+21 |
|\ \ \
| |/ /
|/| | |
|
| * | | fix cetest build properly | Joerg Bornemann | 2010-04-12 | 1 | -17/+21 |
|
|
* | | | 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 |
|
|
* | | 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 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 |
|
|
* | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-03-29 | 2 | -12/+43 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | Enable armcc version specific compler options for Symbian | Miikka Heikkinen | 2010-03-26 | 1 | -0/+10 |
|
|
| * | Made it possible to define more than one language using pkg_prerules | Miikka Heikkinen | 2010-03-24 | 1 | -12/+32 |
|
|
| * | Changed Symbian pkg files to deploy from under epoc32 | Miikka Heikkinen | 2010-03-23 | 1 | -3/+18 |
|
|
* | | Merge remote branch 'origin/4.7' into oslo-staging-1 | Aaron McCarthy | 2010-03-19 | 14 | -861/+1197 |
|\ \ |
|
| * \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60 | axis | 2010-03-18 | 2 | -0/+4 |
| |\ \
| | |/ |
|
| | * | Fixed recursive QMAKE_EXTRA_TARGETS for symbian makefiles. | Rohan McGovern | 2010-03-18 | 2 | -0/+4 |
|
|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-03-17 | 14 | -861/+1193 |
| |\ \ |
|
| | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-03-17 | 14 | -861/+1193 |
| | |\ \ |
|
| | | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60 | axis | 2010-03-16 | 5 | -15/+80 |
| | | |\ \ |
|
| | | * | | | Moved UID2 processing from cpp code to profiles. | axis | 2010-03-15 | 1 | -17/+1 |
|
|
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-03-11 | 17 | -40/+112 |
| | | |\ \ \ |
|
| | | * | | | | Enabled dependencies for .dso and .lib libraries only. | axis | 2010-03-09 | 1 | -1/+3 |
|
|
| | | * | | | | Merge branch 'defFilesAndMisc' | axis | 2010-03-08 | 1 | -0/+4 |
| | | |\ \ \ \ |
|
| | | | * | | | | Added dso dependencies to Symbian targets. | axis | 2010-03-02 | 1 | -0/+4 |
|
|
| | | * | | | | | Fix src!=build issue | Thomas Zander | 2010-03-04 | 1 | -1/+2 |
|
|