summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'qt-master/master'Guoqing Zhang2011-04-051232-81069/+144252
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-0520-129/+326
| |\
| | * Add branch prediction macrosAlberto Mardegan2011-04-043-0/+69
| | * Add methods for traversing and combining QProcessEnvironment.Thomas Sondergaard2011-04-044-0/+105
| | * Handle the HTTP 418 reply properly in QNAMThiago Macieira2011-04-011-0/+5
| | * absorb translations.pri into translations.proOswald Buddenhagen2011-03-313-87/+83
| | * let generated flag control SQL generationMark Brand2011-03-298-42/+62
| | * Add version attributes as per ODF specificationTomas Straupis2011-03-291-0/+2
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-04-042-1/+5
| |\ \
| | * | Designer [Qt Creator integration]: Fix integrated property editor.Friedemann Kleint2011-04-042-1/+5
| * | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-03589-16358/+27083
| |\ \ \
| | * | | Fix animation tests after mergeOlivier Goffart2011-04-021-1/+1
| | * | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-0126-130/+472
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-0121-127/+429
| | | |\ \ \
| | | | * | | Add missing test file.Martin Jones2011-04-011-0/+50
| | | | * | | Changing width of RTL positioner doesn't relayoutMartin Jones2011-04-012-0/+32
| | | | * | | Fix TextInput auto test failure on mac.Andrew den Exter2011-04-011-3/+10
| | | | * | | PinchArea and Flickable don't work well enough togetherMartin Jones2011-03-315-111/+219
| | | | * | | Fix auto test failure.Andrew den Exter2011-03-311-0/+8
| | | | * | | Once Image sourceSize is set there is no way to clear it.Martin Jones2011-03-314-1/+39
| | | | * | | Rotation transform with NaN angle can cause crashMartin Jones2011-03-302-1/+7
| | | | * | | Canceling image download while reading causes crashMartin Jones2011-03-303-3/+7
| | | | * | | Fix width of TextInput micro focus rectangle.Andrew den Exter2011-03-304-8/+57
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-315-3/+43
| | | |\ \ \ \
| | | | * | | | Do not set focus unnecessarily at window activation in SymbianMiikka Heikkinen2011-03-311-1/+2
| | | | * | | | QS60Style: Regression in drawing dialog backgroundSami Merila2011-03-311-1/+2
| | | | * | | | QS60Style: Support menu separator (pt.2)Sami Merila2011-03-311-1/+1
| | | | * | | | Support for new softkey in Symbian^3Titta Heikkala2011-03-313-0/+38
| | * | | | | | Remove duplicated test.Olivier Goffart2011-04-011-20/+0
| | * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-31570-16229/+26632
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-314-4/+4
| | | |\ \ \ \ \
| | | | * | | | | Fixed not switching to MeeGo graphicssystem.Samuel Rødal2011-03-301-1/+1
| | | | * | | | | Fixed rounding of coordinates pre-transformation in CG paintengine.Samuel Rødal2011-03-291-1/+1
| | | | * | | | | Don't include qwindowsurface_gl_p.h on QT_OPENGL_ES_1.Samuel Rødal2011-03-292-2/+2
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-311-15/+19
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | * | | | | QSoftkeyManager auto test updateTitta Heikkala2011-03-301-15/+19
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-304-9/+16
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Corrected case mismatch.axis2011-03-291-1/+1
| | | | * | | | | Fixed pro file syntax in demos/spectrumGareth Stockwell2011-03-291-3/+3
| | | | * | | | | Merge commit 'refs/merge-requests/2584' of gitorious.org:qt/qt into merge-req...Sami Merila2011-03-29679-16869/+33989
| | | | |\ \ \ \ \
| | | | | * | | | | Removed useless Exit button in Symbian^3Titta Heikkala2011-03-281-0/+8
| | | | * | | | | | Fix for failing autotest QToolBar/SymbianSami Merila2011-03-291-5/+4
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-304-44/+29
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | |
| | | | * | | | | | Return correct boundaries reasons from QTextBoundaryFinder.Andrew den Exter2011-03-303-43/+28
| | | | * | | | | | GridView jumps to beginning of list when resizedMartin Jones2011-03-291-1/+1
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-291-1/+11
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | |
| | | | * | | | | | QMeeGoLivePixmapData: Verify dimensions of locked pixmapSami Kyostila2011-03-281-1/+11
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-284-6/+17
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Update changes for 4.7.3Timo Turunen2011-03-281-0/+12
| | | | * | | | | | | directfb: avoid version dependency by setting DSPD_DST blend functions manuallyDenis Oliver Kropp2011-03-281-3/+2