summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Olivier Goffart2011-05-1129-147/+914
|\
| * update def filesShane Kearns2011-05-106-51/+526
| * Merge remote branch 'qt/4.8' into staging-masterShane Kearns2011-05-107-31/+93
| |\
| | * 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-094-27/+85
| | |\ \ | | | |/
| | | * Allow different text for undo actions and items in QUndoViewAlexander Potashev2011-05-093-10/+41
| | | * Allow using not only prefixes for undo command textAlexander Potashev2011-05-093-17/+44
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-05-061-5/+8
| | |\ \
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-05-061-1/+1
| | |\ \ \ | | | | |/ | | | |/|
| | | * | QFileSystemEngine::currentPath(): use QFileSystemEntry() also for the no-PATH...Pino Toscano2011-05-051-1/+1
| * | | | Merge branch 'symbian-socket-engine' into staging-masterShane Kearns2011-05-1017-60/+305
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Sockets: Fix potential null pointer usagesShane Kearns2011-05-052-8/+13
| | * | | Update QTBUG-17223 for Qt 4.8Shane Kearns2011-05-053-1/+16
| | * | | Send User-Agent from the network request in http proxy CONNECT commandShane Kearns2011-05-054-1/+19
| | * | | Fix crash when QSocketNotifier used with an invalid descriptorShane Kearns2011-04-211-0/+6
| | * | | Fix QNetworkReplyImpl error handlingShane Kearns2011-04-181-4/+13
| | * | | Enable per network configuration proxy settings in QNetworkAccessManagerShane Kearns2011-04-182-27/+53
| | * | | Allow a network configuration to be included in a proxy queryShane Kearns2011-04-183-4/+123
| | * | | Optimisation - buffer packet read in pendingDatagramSizeShane Kearns2011-04-132-9/+56
| | * | | Fix error handling in write for socks socket engineShane Kearns2011-04-121-1/+6
| | * | | Remove warnings when disabling notifications on a closed socketShane Kearns2011-04-121-6/+1
| * | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8Bradley T. Hughes2011-05-0623-226/+292
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Do not allow multiple threads to acquire a QMutexBradley T. Hughes2011-05-051-5/+8
| | |_|/ | |/| |
* | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-062-4/+7
|\ \ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-062-4/+7
| |\ \ \ \
| | * | | | fix random miscompilation with msvcOswald Buddenhagen2011-05-061-0/+1
| | * | | | make QLibraryInfo return clean pathsOswald Buddenhagen2011-05-061-4/+6
| | * | | | make relative paths in qt.conf work inside qmakeOswald Buddenhagen2011-05-061-1/+1
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-0617-15/+80
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-051-4/+4
| |\ \ \ \ | | |/ / /
| | * | | QNAM: Re-order checks in migrateBackend()Markus Goetz2011-05-051-4/+4
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-056-4/+36
| |\ \ \ \
| | * | | | Send User-Agent from the network request in http proxy CONNECT commandShane Kearns2011-05-054-1/+19
| | * | | | Fix initial main window dimensions for "fullscreen with softkeys" caseMiikka Heikkinen2011-05-051-0/+5
| | * | | | Fix QNetworkConfigurationManager usage outside main thread firstShane Kearns2011-05-041-3/+12
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-053-0/+9
| |\ \ \ \ \
| | * | | | | Views do not notify count changes properlyMartin Jones2011-05-053-0/+9
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-052-0/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Uninitialized memory is compared.Martin Jones2011-05-052-0/+4
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-047-28/+75
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Fix ordinal number conflictJiang Jiang2011-05-041-1/+1
| | * | | | | QPainterPath: Ignore calls with NaN/Infinite parametersAdemar de Souza Reis Jr2011-05-031-19/+47
| | * | | | | memory leak fixTero Toivola2011-05-031-0/+4
| | * | | | | Fixes crash in QWidget::effectiveWinId.Bjørn Erik Nilsen2011-05-022-0/+21
| | * | | | | Fix merge conflictJiang Jiang2011-04-298-2/+20
| | |\ \ \ \ \
| | * | | | | | Revert symbol addition in b033bb9Jiang Jiang2011-04-293-8/+2
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-05-066-99/+144
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-0575-353/+959
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
generated by cgit v0.12 at 2025-01-02 17:29:42 (GMT)