summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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-10246-4206/+9932
|\ \ \ \
| * | | | Document that Transitions are exclusive.Michael Brasser2010-11-101-1/+5
| * | | | Document TextInput::select(start,end)Michael Brasser2010-11-091-6/+17
| * | | | docWarwick Allison2010-11-091-1/+1
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-09243-4198/+9909
| |\ \ \ \
| | * | | | Fix Text::elide docs.Bea Lam2010-11-091-1/+1
| | * | | | Fix Rectangle painting at small sizes.Martin Jones2010-11-091-1/+2
| | * | | | Fix QML ecmascript autotest.Yann Bodson2010-11-081-1/+2
| | * | | | Fix QtQuick import.Yann Bodson2010-11-081-1/+1
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-08241-4195/+9904
| | |\ \ \ \
| | | * | | | Export QDeclarativeDebugHelper on Symbian for QTBUG-13762Joona Petrell2010-11-081-1/+1
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-11-08161-3977/+6273
| | | |\ \ \ \
| | | | * | | | Text alignment is broken with multi-line text and implicit size.Yann Bodson2010-11-087-12/+143
| | | | * | | | Update QtOpenVg def files for bug QT-3589Joona Petrell2010-11-082-0/+2
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-06231-4185/+9768
| | | | |\ \ \ \
| | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-05231-4185/+9768
| | | | | |\ \ \ \
| | | | | | * | | | Image bounding rect should always include the area being paintedJoona Petrell2010-11-054-3/+99
| | | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-051-2/+1
| | | | | | |\ \ \ \
| | | | | | | * | | | Fix minehunt.pro (minehunt is no longer a plugin)Bea Lam2010-11-051-2/+1
| | | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-0513-333/+363
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / /
| | | | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-05224-4169/+9660
| | | | | | | |\ \ \ \
| | | | | | * | | | | | Don't allow flagging of flipped tiles in MinehuntAlan Alpert2010-11-051-1/+1
| | | | | | * | | | | | Remove Snake demo from QtDemoAlan Alpert2010-11-051-1/+0
| | | | | | * | | | | | Fix samegame text input focusAlan Alpert2010-11-051-3/+1
| | | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-0461-3168/+2776
| | | | | | |\ \ \ \ \ \ | | | | | | | | |/ / / / | | | | | | | |/| | | |
| | | | | | | * | | | | Update visual tests for Mac.Yann Bodson2010-11-0461-3168/+2776
| | | | | | * | | | | | Whitespace fixesAlan Alpert2010-11-043-14/+14
| | | | | | |/ / / / /
| | | * | | | | | | | Don't use stdint.h in our headers since it is a C99 header.Martin Jones2010-11-082-12/+5
| | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | Run all QML visual tests now.Alan Alpert2010-11-041-1/+1
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-0421-77/+253
| | | |\ \ \ \ \ \ \