Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'qt-mainline/master' | aavit | 2011-03-15 | 27 | -34/+34 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7 | Thiago Macieira | 2011-03-11 | 28 | -26/+30 |
| |\ | |||||
| | * | Update copyright year to 2011. | Rohan McGovern | 2011-03-10 | 25 | -25/+25 |
| * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2011-03-11 | 3 | -10/+10 |
| |\ \ | |||||
| | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-03-10 | 10 | -31/+31 |
| | |\ \ | |||||
| | | * | | Bump Qt version to 4.7.3 | Timo Turunen | 2011-03-09 | 10 | -31/+31 |
* | | | | | Introduce QFontEngineDirectWrite | Eskil Abrahamsen Blomfeldt | 2011-03-14 | 1 | -2/+32 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-03-10 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-03-09 | 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 | 2011-03-08 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * \ | Merge remote-tracking branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2011-03-08 | 1 | -1/+1 |
| | | |\ \ | |||||
| | | | * | | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 1182 | -1193/+1193 |
| | | | * | | embed copyright information in QtAssistantClient4.dll | Joerg Bornemann | 2010-12-17 | 1 | -0/+2 |
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-03-09 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix warning about uninitialised variable use | Thiago Macieira | 2011-03-08 | 1 | -1/+1 |
* | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-03-08 | 3 | -1/+14 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-03-08 | 3 | -1/+14 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-03-07 | 3 | -1/+14 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Invalidate the EGL surface of QMeeGoLivePixmapData when switching to Raster | Pauli Nieminen | 2011-03-07 | 3 | -1/+14 |
| | | | |/ / / | | | |/| | | | |||||
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast... | Qt Continuous Integration System | 2011-03-08 | 3 | -1/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Designer: Set dirty correctly in case resource paths were changed. | Friedemann Kleint | 2011-03-07 | 3 | -1/+5 |
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-03-02 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | qdoc3: Fix compilation with -no-stl | hjk | 2011-03-02 | 1 | -0/+2 |
* | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-01 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-28 | 1 | -0/+2 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Fix qmlviewer compilation on old Symbian platforms | Joona Petrell | 2011-02-24 | 1 | -0/+2 |
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-02-28 | 1 | -0/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Store property editor's column positions in settings | Jarek Kobus | 2011-02-23 | 1 | -0/+4 |
* | | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-02-25 | 1 | -0/+5 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-02-25 | 1 | -0/+5 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | Always prepend drive letter to $$EPOCROOT in Windows Symbian builds | Miikka Heikkinen | 2011-02-24 | 1 | -0/+5 |
* | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-23 | 1 | -6/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7 | Joona Petrell | 2011-02-22 | 123 | -14417/+7766 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-02-20 | 1 | -3/+7 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Attempt to fix symbian 3.1 and 3.2 compile break. | Jason McDonald | 2011-02-18 | 1 | -3/+7 |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-18 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Another stab at fixing compilation on old Symbian platforms | Joona Petrell | 2011-02-22 | 2 | -5/+3 |
| | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Fix compilation on old Symbian platforms | Joona Petrell | 2011-02-18 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast... | Qt Continuous Integration System | 2011-02-22 | 1 | -6/+14 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Designer: Check for 0-spacing when loading grid settings. | Friedemann Kleint | 2011-02-21 | 1 | -6/+14 |
* | | | | | | | | Fix compilation: Q_UNUSED takes exactly one variable that is unused | Thiago Macieira | 2011-02-21 | 1 | -1/+1 |
* | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-17 | 3 | -5/+14 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-14 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| / / / / | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | Rename 'plugins\qmldebugging' (work around qmake issues) | Kai Koehne | 2011-02-11 | 1 | -2/+2 |
| * | | | | | | Designer: Slots of main container not visible in signal/slot editor. | Friedemann Kleint | 2011-02-11 | 2 | -3/+12 |
* | | | | | | | Merge branch earth-team/master into earth-staging | João Abecasis | 2011-02-16 | 1 | -6/+27 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master | axis | 2011-01-31 | 1233 | -1287/+1297 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | Help message clarification | Thiago Marcos P. Santos | 2011-01-14 | 1 | -1/+1 |
| * | | | | | | | No longer copy the executable file to phone by default | Thiago Marcos P. Santos | 2011-01-14 | 1 | -5/+26 |
* | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-10 | 122 | -14413/+7753 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | |