Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-23 | 1 | -2/+2 |
|\ | |||||
| * | Made documentation of QPixmap::createMaskFromColor match behaviour. | Samuel Rødal | 2010-12-22 | 1 | -2/+2 |
* | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2010-12-14 | 2 | -8/+28 |
|\ \ | |||||
| * \ | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-13 | 2 | -8/+28 |
| |\ \ | | |/ | |||||
| | * | Prevent always deep-copying in QPixmap::toImage() for raster pixmaps. | Samuel Rødal | 2010-12-07 | 1 | -5/+8 |
| | * | Make sure to do a deep copy of a QImage when it's being painted on. | Samuel Rødal | 2010-12-06 | 2 | -8/+25 |
* | | | Corrected documentation for QImage::fill(). | Kim Motoyoshi Kalland | 2010-12-13 | 1 | -2/+2 |
|/ / | |||||
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-06 | 1 | -36/+48 |
|\ \ | |/ | |||||
| * | Improvement of de30288: handle PNGs having 1 to 4 bytes truncated. | aavit | 2010-12-01 | 1 | -1/+2 |
| * | Workaround for certain malformed PNGs that lack the final crc bytes | aavit | 2010-12-01 | 1 | -34/+46 |
* | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into... | Qt Continuous Integration System | 2010-12-02 | 2 | -0/+21 |
|\ \ | |||||
| * \ | Merge remote branch 'origin/master' into lighthouse-master | Jørgen Lind | 2010-11-29 | 1 | -0/+2 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Gunnar Sletta | 2010-11-19 | 14 | -56/+105 |
| |\ \ \ | |||||
| * | | | | Moving QCoreTextFontEngine with related classes into own file | Jørgen Lind | 2010-10-28 | 2 | -0/+21 |
* | | | | | QRasterPixmapData: Reuse underlying QImage in fill() if possible. | Andreas Kling | 2010-11-30 | 3 | -40/+46 |
| |_|/ / |/| | | | |||||
* | | | | Fix some warnings on Mac | Jiang Jiang | 2010-11-22 | 1 | -0/+2 |
| |/ / |/| | | |||||
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-12 | 3 | -2/+5 |
|\ \ \ | | |/ | |/| | |||||
| * | | Doc: Fixing typo | Sergio Ahumada | 2010-11-09 | 2 | -2/+2 |
| * | | Fixed tst_qwidget::testContentsPropagation auto-test failure. | Samuel Rødal | 2010-11-09 | 1 | -3/+5 |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-11-05 | 1 | -2/+3 |
| |\ \ | |||||
| | * | | Fixed grabWidget sometimes returning uninitialized memory. | Samuel Rødal | 2010-11-03 | 1 | -2/+3 |
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-05 | 1 | -8/+17 |
|\ \ \ \ | |/ / / | |||||
| * | | | Prevent excessive seeks in xbm detection | Harald Fernengel | 2010-11-04 | 1 | -8/+17 |
| |/ / | |||||
* | | | Add member-swap to shared datatypes that don't have it. | Marc Mutz | 2010-11-03 | 10 | -0/+47 |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 | aavit | 2010-11-02 | 9 | -2/+549 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix the license in files for Lighthouse | Jørgen Lind | 2010-10-28 | 2 | -0/+82 |
| * | | Fix qt_defaultDpi, but not use Q_DECL_IMPORT but Q_GUI_EXPORT | Jørgen Lind | 2010-10-28 | 1 | -2/+2 |
| * | | Compile fix for RVCT 4 | Jørgen Lind | 2010-10-28 | 1 | -2/+2 |
| * | | Fix QT_BLITTER_RASTEROVERLAY and namespace error | Jørgen Lind | 2010-10-27 | 1 | -1/+2 |
| * | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-26 | 2 | -1/+2 |
| |\ \ | |||||
| * \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-22 | 4 | -2/+19 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-05 | 5 | -76/+107 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Gunnar Sletta | 2010-09-27 | 5 | -50/+51 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-09-13 | 6 | -3/+68 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-08-26 | 1 | -3/+5 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-08-19 | 8 | -51/+278 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge remote branch 'lighthouse/4.7' into lighthouse-master | Jørgen Lind | 2010-08-05 | 3 | -9/+6 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouse | Jørgen Lind | 2010-08-03 | 5 | -19/+208 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Removed createBlittable factory function from PlatformIntegration | Jørgen Lind | 2010-07-22 | 2 | -8/+5 |
| * | | | | | | | | | | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-08-04 | 4 | -18/+207 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'remotes/lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-07-19 | 9 | -2/+469 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-07-14 | 29 | -129/+4170 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouse | Jørgen Lind | 2010-06-24 | 5 | -83/+400 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Refactored QGraphicsSystemCursor -> QPlatformCursor | Jørgen Lind | 2010-06-24 | 1 | -0/+4 |
| | * | | | | | | | | | | | | | Adding -qpa configure switch | Jørgen Lind | 2010-06-24 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | Renamed files from *_lite* to *_qpa* | Jørgen Lind | 2010-06-24 | 2 | -1/+1 |
| | * | | | | | | | | | | | | | Say hello to Q_WS_QPA! | Jørgen Lind | 2010-06-24 | 4 | -5/+5 |
| | * | | | | | | | | | | | | | Merge remote branch 'qt/4.7' into lighthouse | Paul Olav Tvete | 2010-06-18 | 16 | -80/+196 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-05-10 | 7 | -17/+67 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'origin/4.7' into lighthouse | Jørgen Lind | 2010-04-21 | 8 | -16/+30 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |