summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-09-229-25/+39
|\
| * Rename some variables to improve readability.Frederik Gladhorn2010-09-211-20/+21
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-09-208-5/+18
| |\
| | * Make QStaticText honor QPainter::pen() for rich text on X11 w/rasterEskil Abrahamsen Blomfeldt2010-09-201-1/+4
| | * Fixed qdeclarativetext auto-test to work with raster graphicssystem.Samuel Rødal2010-09-203-0/+0
| | * Fixed QStaticText auto-test to work with raster graphicssystem.Samuel Rødal2010-09-201-1/+1
| | * Give a warning in QPixmap::handle() if pixmap is not X11 class.Samuel Rødal2010-09-181-2/+6
| | * QThreadPool: name pooled threadsArvid Ephraim Picciani2010-09-171-0/+1
| | * Make raster the default graphics system on X11.Samuel Rødal2010-09-172-1/+6
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-09-217-12/+27
|\ \ \ | |/ / |/| |
| * | fix project name duplicates in generated projects.slnJoerg Bornemann2010-09-214-4/+6
| * | Doc: document QMAKE_PROJECT_NAMEJoerg Bornemann2010-09-211-5/+13
| * | qmake: introduction of QMAKE_PROJECT_NAMEJoerg Bornemann2010-09-212-3/+8
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-09-201-4/+1
|\ \ \ | |/ /
| * | configure.exe: endianess on Windows is always little endianJoerg Bornemann2010-09-201-4/+1
|/ /
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-09-162-12/+11
|\ \ | |/
| * fix CRLFHarald Fernengel2010-09-161-9/+9
| * Fixes makeCurrent() failed messages on several systems.Trond Kjernåsen2010-09-161-3/+2
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-09-164-47/+276
|\
| * Support "icon form theme" inside property editorJarek Kobus2010-09-164-47/+276
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-09-143-10/+8
|\
| * Fix crash in Mac font loadingJiang Jiang2010-09-142-8/+3
| * fix tiff reader to handle TIFFTAG_SAMPLESPERPIXEL for grayscale imagesLuboš Luňák2010-09-141-2/+5
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-09-141-1/+26
|\
| * Skip sub pixel positions test if font smoothing is offEskil Abrahamsen Blomfeldt2010-09-141-0/+25
| * Q_MAC_USE_COCOA -> QT_MAC_USE_COCOAEskil Abrahamsen Blomfeldt2010-09-141-1/+1
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-09-143-6/+21
|\ \
| * | Properly implement qobject_cast for const pointers.Thiago Macieira2010-09-113-6/+21
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-09-1423-106/+394
|\ \ \ | |/ / |/| / | |/
| * Fix QPainter test failure on Mac/CarbonEskil Abrahamsen Blomfeldt2010-09-141-2/+2
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-09-1023-106/+394
| |\ |/ /
| * Fix typos.Frederik Gladhorn2010-09-102-2/+2
| * Fix typo in declative example.Frederik Gladhorn2010-09-101-1/+1
| * test for gdb version before runnning dwarf indexingArvid Ephraim Picciani2010-09-101-0/+1
| * Fix Core Text font loading for certain Mac FontsJiang Jiang2010-09-105-38/+58
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-09-1016-65/+332
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-09-0916-65/+332
| | |\
| | | * Support sub pixel positioning of glyphs in raster engineEskil Abrahamsen Blomfeldt2010-09-0914-44/+191
| | | * Added basic tests for threaded QPainter drawing onto FBOs and PBOs.Trond Kjernåsen2010-09-092-21/+141
* | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-09-10584-11967/+25917
|\ \ \ \ | |/ / / |/| | |
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-10584-11967/+25917
| |\ \ \ |/ / / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-102-4/+28
| |\ \ \
| | * \ \ Merge branch '4.6-s60' into 4.7-s60axis2010-09-100-0/+0
| | |\ \ \
| | | * | | Fixed crash in input methods when using symbols menu and numbers onlyaxis2010-09-102-4/+28
| | * | | | Fixed crash in input methods when using symbols menu and numbers onlyaxis2010-09-102-4/+28
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-101-0/+13
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Read the data when the stream passed in is of type CArchiveStreamAndy Shaw2010-09-101-0/+13
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-103-26/+68
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Autotest for QTBUG-13454.Yann Bodson2010-09-102-16/+55
| | * | | | Changing the Image 'source' should not go through the 'Loading' state if the ...Yann Bodson2010-09-101-10/+13
| |/ / / /