summaryrefslogtreecommitdiffstats
path: root/src
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 System2011-09-221-1/+1
|\
| * Incorrect 'break' in switch-case was replaced by 'return'Viktor Kolesnyk2011-09-221-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-09-221-0/+4
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-09-222-1/+12
| |\ \
| * | | QLineControl: selectedTextChanged() signal is omitted in some casesSami Merila2011-09-221-0/+4
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-09-211-1/+9
|\ \ \ \ | | |/ / | |/| |
| * | | QML import path puts Qt dirs in correct Symbian ordermread2011-09-211-1/+9
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-09-201-0/+1
|\ \ \ \
| * | | | Avoid runtime warning about interlace handling from libpng 1.5aavit2011-09-201-0/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-09-191-0/+3
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | symbian bearer: fix tst_qnetworksession test failuresShane Kearns2011-09-191-0/+3
| | |/ / | |/| |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-09-151-2/+5
|\ \ \ \ | | |_|/ | |/| |
| * | | Add missing checks for httpReply in QNetworkHttpBackend.Jocelyn Turcotte2011-09-131-2/+5
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-09-154-83/+145
|\ \ \ \ | | |/ / | |/| |
| * | | Refactor dangerous multiple inheritanceShane Kearns2011-09-142-25/+86
| * | | Fix RConnection handle leak in symbian bearer pluginShane Kearns2011-09-142-57/+41
| * | | Prevent crash when cache is changed on the flyShane Kearns2011-09-142-4/+21
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-122-5/+8
|\ \ \ \
| * | | | StrictlyEnforceRange with snapOneItem/Row and header behavior changeMartin Jones2011-09-122-5/+8
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-09-093-5/+12
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Release font engine refcount when done using it in QTextEngineJiang Jiang2011-09-093-5/+12
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-09-081-0/+5
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | update the proxy info before session is opened in QNAM by Aapo MakelaKranthi Kuntala2011-09-081-0/+5
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-09-071-2/+3
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'mainline/4.7' into 4.7Casper van Donderen2011-09-0230-113/+320
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-08-17259-54226/+28871
| |\ \ \ \ \ \
| * | | | | | | Doc: Fixed the example of an encoded URL in the class description.David Boddie2011-07-211-2/+3
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-09-075-21/+48
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | QSslCertificate: block all DigiNotar (intermediate and root) certsPeter Hartmann2011-09-062-8/+35
| * | | | | | | QSslCertificate: also check common name for blacklisted certificatesPeter Hartmann2011-09-061-11/+12
| * | | | | | | Fix typo in header guard.Jason McDonald2011-09-061-1/+1
| * | | | | | | fix doc typoOswald Buddenhagen2011-09-051-1/+1
| * | | | | | | Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdkOswald Buddenhagen2011-09-051-1/+1
| * | | | | | | remove obsolete defineOswald Buddenhagen2011-09-051-1/+0
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-074-2/+18
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | Dragging in nested views no longer works as expectedMartin Jones2011-09-071-1/+1
| * | | | | Fix implicit height not growing when pre-edit text wraps.Andrew den Exter2011-09-061-1/+3
| * | | | | Fix leak in State element.Michael Brasser2011-09-021-0/+12
| * | | | | Fix leak in bindings created by PropertyChanges.Michael Brasser2011-09-011-0/+2
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-09-021-4/+4
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | URLs used with scheme handler use appropriate encoding for schememread2011-09-011-4/+4
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-022-4/+8
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Revert readonly BorderImage::sourceSize changeMartin Jones2011-09-012-4/+8
| * | | | Fix memory leak in ListModel custom parserBea Lam2011-09-011-0/+1
* | | | | DEF file updateGareth Stockwell2011-08-312-2/+2
* | | | | Merge branch 'qt-4.7' into 4.7Liang Qi2011-08-3127-64/+155
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | QSslCertificate: blacklist fraudulent *.google.comPeter Hartmann2011-08-301-0/+1
| * | | | Symbian: Not possible to catch RequestSoftwareInputPanel in eventFilterSami Merila2011-08-301-4/+0
| * | | | Exact word bubble doesn't disappear when screen is tapped (fix part 2)Sami Merila2011-08-302-4/+11
| * | | | Exact word bubble doesn't disappear when screen is tappedSami Merila2011-08-301-0/+4