summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-126-13/+49
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-121-1/+1
| |\
| | * QWidgetPrivate::setParent_sys might be using null pointerSami Merila2011-05-121-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-122-1/+23
| |\ \
| | * | Ensure the TextEdit cursor delegate is repositioned on mouse events.Andrew den Exter2011-05-122-1/+23
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-121-1/+3
| |\ \ \ | | |/ /
| | * | Don't crash on an invalid replacementStart from an input method.Andrew den Exter2011-05-121-1/+3
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-111-1/+1
| |\ \ \
| | * | | Fix incorrect hardware address on systems without getifaddrs()Craig Scott2011-05-111-1/+1
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-111-9/+21
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Enable multisampling on Symbian if hw supports itJani Hautakangas2011-05-111-9/+21
* | | | | CompileOlivier Goffart2011-05-121-1/+0
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-1119-15/+313
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-1027-17/+713
| |\ \ \ \ | | |/ / /
| | * | | Fix QtCoreu.def file errorJani Hautakangas2011-05-101-13/+0
| | * | | Merge commit 'v4.7.3' into 4.7Eckhart Koppen2011-05-100-0/+0
| | |\ \ \
| | | * | | Update changes for 4.7.3v4.7.3Timo Turunen2011-03-301-0/+12
| | | * | | Show softkeys when opening a dialog that has a fullscreen parent.Miikka Heikkinen2011-03-292-19/+64
| | | * | | QSslCertificate: report fraudulent certificates as invalidTimo Turunen2011-03-2812-4/+204
| | | * | | QSslCertificate: fix test for blacklisted certs on WindowsTimo Turunen2011-03-281-0/+9
| | | * | | QSslSocket internals: abort on encountering blacklisted certificatesPeter Hartmann2011-03-281-0/+7
| | | * | | QSslSocket: add test for blacklisted certificatesPeter Hartmann2011-03-283-3/+74
| | | * | | Changes for 4.7.3Timo Turunen2011-03-231-0/+47
| | | * | | Fix for wrong dpi metrics for raster pixmaps on Symbian.Laszlo Agocs2011-03-171-18/+11
| | | * | | Fix qgraphicstransform autotest for Symbian, where qreal is float.Laszlo Agocs2011-03-161-2/+12
| | | * | | QS60Style: QTreeView::indexRowSizeHint returns incorrect valueSami Merila2011-03-161-2/+5
| | | * | | QDeclarativeDebug: Export needed symbols on SymbianTimo Turunen2011-03-143-47/+47
| | | * | | Bump Qt version to 4.7.3Timo Turunen2011-03-1120-38/+38
| | | * | | Fix QTBUG-17627: build break in mobility bearer applicationsCristiano di Flora2011-03-111-3/+2
| | | * | | Fix for major regression in OpenVG clippingJani Hautakangas2011-03-111-0/+1
| | | * | | Unsuccessful unlocking of QNetworkConfigurationPrivate mutexPerttu Pohjonen2011-03-101-0/+1
| | * | | | Introduce platform extension to QGraphicsSystemJani Hautakangas2011-05-1028-17/+726
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-101-0/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix Symbian/WinsCW build breakSami Merila2011-05-101-0/+1
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-094-0/+20
| |\ \ \ \ \
| | * | | | | Prevent crash in OpenGL engine when scaling images / pixmaps.Samuel Rødal2011-05-094-0/+20
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-093-3/+5
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | emit QNetWorkAccessManager::finished on QNetworkReply::abort()Martin Petersson2011-05-091-0/+2
| | * | | | | Fix -no-guiBernhard Rosenkraenzer2011-05-091-2/+2
| | * | | | | Don't run XLib check if -no-gui is usedBernhard Rosenkraenzer2011-05-091-1/+1
* | | | | | | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Olivier Goffart2011-05-1143-224/+1421
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-05-1031-117/+1111
| |\ \ \ \ \ \ \
| | * | | | | | | update def filesShane Kearns2011-05-106-51/+526
| | * | | | | | | Merge remote branch 'qt/4.8' into staging-masterShane Kearns2011-05-1013-103/+330
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-05-092-3/+7
| |\ \ \ \ \ \ \ \
| | * | | | | | | | ifdef out mac/no_coreservices path more cleanlyOswald Buddenhagen2011-05-091-3/+2
| | * | | | | | | | fix build on symbianOswald Buddenhagen2011-05-091-0/+5
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-05-098-27/+266
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Allow different text for undo actions and items in QUndoViewAlexander Potashev2011-05-094-10/+100
| | * | | | | | | | Allow using not only prefixes for undo command textAlexander Potashev2011-05-097-17/+166