summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-1130-151/+183
|\
| * remove pointless assignment of deprecated variableOswald Buddenhagen2010-11-101-1/+0
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into osl1-4.7Harald Fernengel2010-11-101-6/+3
| |\
| | * Fixed a shell syntax error in configureDenis Dzyubenko2010-11-101-6/+3
| * | fix tst_headersHarald Fernengel2010-11-102-2/+4
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-1028-143/+177
| |\
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7juhvu2010-11-107-38/+71
| | |\
| | | * Clear X11 structure before useHarald Fernengel2010-11-091-1/+4
| | | * Make operator QRectF constHarald Fernengel2010-11-091-1/+1
| | | * Fix GC-related crash in QScriptValue::setData()Kent Hansen2010-11-093-0/+15
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-11-091188-66970/+60694
| | | |\
| | | * | get rid of dependency on QtGuiLorn Potter2010-11-092-36/+51
| | * | | Removed implicity QtGui linking from icd.pro as it is not needed.juhvu2010-11-091-1/+1
| | | |/ | | |/|
| | * | DFB: Make sure QPixmap::hasAlpha is respectedAnders Bakken2010-11-081-7/+27
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-0820-104/+85
| | |\ \
| | | * | fix build on mingwKonstantin Ritt2010-11-083-15/+15
| | | * | Fix some painting issues in QDirectFBPaintEngineAnders Bakken2010-11-081-9/+15
| | | * | QNAM: Do not need QNetworkSession in AlwaysCache load modeMarkus Goetz2010-11-082-12/+21
| | | * | Don't crash if QScriptClass property getter returns an invalid valueKent Hansen2010-11-082-0/+33
| | | * | QNAM: Remove dead waitForUpstreamBytesWritten() codeMarkus Goetz2010-11-082-7/+0
| | | * | QNAM: Remove dead waitForDownstreamReadyRead() codeMarkus Goetz2010-11-0811-61/+0
| | | * | fix memleak in testHarald Fernengel2010-11-081-0/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-112-1/+16
|\ \ \ \ \
| * | | | | QDeclarativeDebug: Keep source information when changing an expressionChristiaan Janssen2010-11-101-1/+2
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-11-102-2/+6
| |\ \ \ \ \ | | |/ / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-11-1031-393/+1028
| |\ \ \ \ \
| * | | | | | Flickable does not reposition its content when it is resized.Martin Jones2010-11-101-0/+14
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-101-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use $${EPOCROOT} variable rather than absolute paths in .pro filesGareth Stockwell2010-11-101-1/+1
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-1057-222/+756
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed tst_qpixmap::grabWidget autotest failure on QWS.Samuel Rødal2010-11-101-22/+32
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-0958-201/+726
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Doc: Fixing typoSergio Ahumada2010-11-0910-15/+15
| | * | | | | | | | Doc: Fixing typoSergio Ahumada2010-11-091-1/+1
| | * | | | | | | | Doc: Fixing typoSergio Ahumada2010-11-0920-29/+29
| | * | | | | | | | Fixed tst_qwidget::testContentsPropagation auto-test failure.Samuel Rødal2010-11-091-3/+5
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-0829-160/+683
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | | * | | | | | | Fixed text rendering bug in raster engine when opacity != 1.0.Samuel Rødal2010-11-082-1/+28
| | | * | | | | | | Prevented race condition on texture destruction.Samuel Rødal2010-11-084-12/+38
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-0827-158/+628
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-0627-158/+628
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-0527-158/+628
| | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-0527-158/+628
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | More fix for QTBUG-14640:oci performance problem with qlonglongCharles Yin2010-11-053-29/+227
| | | | | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-0426-154/+426
| | | | | | | |\ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-0326-154/+426
| | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | * | | | | | | Doc: Fixing typoSergio Ahumada2010-11-031-3/+3
| | | | | | | | | * | | | | | | Fixed grabWidget sometimes returning uninitialized memory.Samuel Rødal2010-11-032-3/+4
| | | | | | | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-0324-151/+422
| | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | * | | | | | | Fix Malayalam Rendering - 'Ra' is PreBaseJiang Jiang2010-11-021-1/+1