summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* ListView.SnapToItem with ListView.StrictlyEnforceRange is broken.Martin Jones2010-11-151-34/+20
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-153-17/+74
|\
| * Fix PathView key navigation docs.Martin Jones2010-11-121-1/+15
| * Ensure increment/decrementCurrentIndex always move items in the correct direc...Martin Jones2010-11-122-10/+24
| * Ensure loaded item's parent is set before component completion.Martin Jones2010-11-121-6/+35
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2010-11-115-78/+158
|\ \ | |/ |/|
| * Doc: Fixing typoSergio Ahumada2010-11-111-1/+1
| * Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-096-5/+101
| |\
| * | QS60Style: Color calculation should be optimizedSami Merila2010-11-092-5/+5
| * | QS60Style: Color calculation should be optimizedSami Merila2010-11-093-59/+130
| * | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-083-17/+15
| |\ \
| * \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-0517-46/+94
| |\ \ \
| * \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-0411-41/+82
| |\ \ \ \
| * | | | | With some locales, QDoubleValidator would not accept "C" locale valid numbersGabriel de Dietrich2010-11-022-19/+28
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-112-16/+60
|\ \ \ \ \ \
| * | | | | | SSL: Fix crashes/hangs when retrieving CA certificatesShane Kearns2010-11-112-16/+60
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-116-37/+146
|\ \ \ \ \ \ \
| * | | | | | | Coding style: bang cleanup.Michael Dominic K2010-11-111-10/+10
| * | | | | | | Removed call to glFinish, obsoleted by fence syncs.Michael Dominic K2010-11-111-1/+0
| * | | | | | | Plugin-side support for creating/destroying/waiting on fence sync.Michael Dominic K2010-11-114-13/+49
| * | | | | | | Added MeeGo graphicssystem entry points for KHR_fence_sync.Michael Dominic K2010-11-112-2/+76
| * | | | | | | Trailing whitespace fixes.Michael Dominic K2010-11-113-15/+15
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-1121-128/+126
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-1021-128/+126
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7juhvu2010-11-105-38/+57
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | 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-091-0/+1
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-11-09277-5041/+6257
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | 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-0815-89/+48
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | | * | | | | | | | 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-081-0/+12
| | | * | | | | | | | QNAM: Remove dead waitForUpstreamBytesWritten() codeMarkus Goetz2010-11-082-7/+0
| | | * | | | | | | | QNAM: Remove dead waitForDownstreamReadyRead() codeMarkus Goetz2010-11-0811-61/+0
* | | | | | | | | | | 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-1011-29/+138
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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-1044-186/+434
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-0945-186/+435
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| | * | | | | | | | | | | Doc: Fixing typoSergio Ahumada2010-11-099-13/+13
| | * | | | | | | | | | | Doc: Fixing typoSergio Ahumada2010-11-091-1/+1
| | * | | | | | | | | | | Doc: Fixing typoSergio Ahumada2010-11-0917-25/+25