Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2010-02-20 | 2 | -17/+24 |
|\ | |||||
| * | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-20 | 6 | -201/+101 |
| |\ | |||||
| * \ | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-20 | 1 | -6/+13 |
| |\ \ | |||||
| | * | | Fixed libstdcpp.dll version autodetection for Symbian | Miikka Heikkinen | 2010-02-19 | 1 | -6/+13 |
| * | | | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-18 | 12 | -4/+14 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch '4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-17 | 1 | -11/+11 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Only use unix-like tools when not building for Symbian in Windows. | Miikka Heikkinen | 2010-02-16 | 1 | -9/+9 |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-... | Qt Continuous Integration System | 2010-02-20 | 1 | -0/+114 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Added exception to destdir location for abld and sbsv2. | axis | 2010-02-19 | 1 | -3/+7 |
| * | | | | Moved the "sis" target and friends from cpp code to qmake profiles. | axis | 2010-02-19 | 1 | -0/+110 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast... | Qt Continuous Integration System | 2010-02-19 | 4 | -7/+101 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast... | Qt Continuous Integration System | 2010-02-18 | 4 | -7/+101 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | amend "purge msvc.net and msvc2002 makespecs" | Oswald Buddenhagen | 2010-02-17 | 4 | -7/+101 |
| | |/ / | |||||
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Martin Jones | 2010-02-18 | 11 | -3/+13 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix copyright year. | Jason McDonald | 2010-02-16 | 3 | -3/+3 |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-13 | 9 | -1/+11 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-13 | 9 | -1/+11 |
| | |\ \ | |||||
| | | * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-12 | 9 | -1/+11 |
| | | |\ \ | |||||
| | | | * | | readdir64 is not available on HP-UX | João Abecasis | 2010-02-12 | 9 | -1/+11 |
* | | | | | | Remove linux-g++-x11egl mkspec. | Michael Brasser | 2010-02-16 | 2 | -194/+0 |
|/ / / / / | |||||
* | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-13 | 13 | -550/+221 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefs | Oswald Buddenhagen | 2010-02-12 | 1 | -0/+2 |
| * | | | | move $(DEL_FILE) 2> NUL redirection into .conf file | Oswald Buddenhagen | 2010-02-12 | 1 | -1/+1 |
| * | | | | fix host platform conditional | Oswald Buddenhagen | 2010-02-12 | 1 | -1/+1 |
| * | | | | purge msvc.net and msvc2002 makespecs. unsupported for a while now. | Oswald Buddenhagen | 2010-02-12 | 4 | -359/+0 |
| * | | | | purge msvc6 suppport from qmake. qt doesn't support it for quite a while now. | Oswald Buddenhagen | 2010-02-12 | 5 | -229/+1 |
| |/ / / | |||||
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-10 | 4 | -0/+256 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-05 | 4 | -0/+256 |
| | |\ \ | |||||
| | | * \ | Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso... | Warwick Allison | 2010-02-04 | 4 | -0/+256 |
| | | |\ \ | |||||
| | | | * \ | Merge commit 'qt/4.6' into kinetic-declarativeui | Bjørn Erik Nilsen | 2010-01-27 | 3 | -1/+34 |
| | | | |\ \ | |||||
| | | | * \ \ | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2010-01-19 | 2 | -1/+3 |
| | | | |\ \ \ | |||||
| | | | * \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2010-01-14 | 129 | -130/+128 |
| | | | |\ \ \ \ | |||||
| | | | * \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Aaron Kennedy | 2010-01-05 | 8 | -10/+121 |
| | | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-17 | 4 | -5/+5 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-10 | 4 | -188/+180 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-07 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-27 | 2 | -12/+26 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-19 | 4 | -27/+74 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-09 | 56 | -16/+137 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-04 | 4 | -4/+39 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Warwick Allison | 2009-10-30 | 2 | -3/+3 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2009-10-29 | 2 | -3/+3 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | fix headers | Warwick Allison | 2009-10-29 | 2 | -19/+49 |
| | | | |/ / / / / / / / / / / / / / | |||||
| | | | * | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-25 | 1 | -0/+9 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-19 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-19 | 5 | -5/+94 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-06 | 2 | -5/+11 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-04 | 3 | -9/+20 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'qt-mainline/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-10-02 | 2 | -1/+16 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-09-29 | 7 | -9/+18 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |