summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* doc: Stated that the destructor does not call close().Martin Smith2010-11-121-1/+4
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-1151-218/+693
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-114-17/+65
| |\
| | * SSL: Fix for capabilities in QSslCertificate auto testShane Kearns2010-11-111-1/+2
| | * Doc: update symbian capabilities regarding SSLShane Kearns2010-11-111-0/+3
| | * 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-1114-48/+428
| |\ \
| | * | 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
| | * | Helper-side support for QMeeGoFenceSync.Michael Dominic K2010-11-118-11/+282
| | * | 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-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
* | | | | | | | | qdoc: Added QML Elements to the Assistant indexMartin Smith2010-11-113-10/+20
* | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2010-11-11306-4443/+10713
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-10306-4443/+10713
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | 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