summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* simplify the code by using QSystemLibrary a bit smarterKonstantin Ritt2011-10-073-40/+26
* use QSystemLibrary::resolve() instead of GetProcAddress() win API callsKonstantin Ritt2011-10-073-37/+31
* nativewifi bearer plugin: prefer DLL Safe Search modeKonstantin Ritt2011-10-071-14/+17
* make QElapsedTimer use QSystemLibrary on winKonstantin Ritt2011-10-071-8/+6
* Merge branch '4.8-upstream' into master-waterWater-Team2011-10-061-1/+0
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-10-061-1/+0
| |\
| | * Build fix for WINCE to qfilesystemengine_win.cppjaanttil2011-10-051-1/+0
* | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-0426-117/+169
|\ \ \ | |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-10-0412-29/+11
| |\ \ | | |/
| | * QNetworkAccessBackend::start() is used although QT_NO_BEARERMANAGEMENT is def...shkim2011-09-291-2/+0
| | * retreving -> retrievingAlbert Astals Cid2011-09-281-3/+3
| | * Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-09-28107-3499/+5986
| | |\
| | * | Removed obsolete QWS_ALPHA_CURSOR feature.jaanttil2011-09-274-16/+0
| | * | Removed duplicate link from QFinalState documentation.jaanttil2011-09-271-1/+1
| | * | Clarified keypad navigation specific event documentation.jaanttil2011-09-271-2/+2
| | * | docs: Typo and link fixes.jaanttil2011-09-273-4/+4
| | * | Use the right callback in QObject::disconnect()Olivier Goffart2011-09-271-1/+1
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-10-0414-88/+158
| |\ \ \
| | * | | QDeclarativeDebug: Fix autotest breakage in qdeclarativedebugjsKai Koehne2011-09-291-3/+7
| | * | | Fix assertAaron Kennedy2011-09-281-1/+1
| | * | | Compile fix for SymbianAaron Kennedy2011-09-211-4/+4
| | * | | Merge remote-tracking branch 'qt-qml-review/master' into master-qml-stagingKai Koehne2011-09-20727-9463/+21781
| | |\ \ \
| | | * | | Debugger: Rename qdeclarativedebug* to qdeclarativeenginedebug*Kai Koehne2011-09-163-6/+6
| | | * | | Rename QDeclarativeEngineDebugServer to ~ServiceKai Koehne2011-09-167-58/+58
| | | * | | Debugger: Move QT_DECLARATIVE_DEBUG handling out of qdeclarative.hKai Koehne2011-09-155-12/+71
| | * | | | Fix aliasing bug when compiled with gcc 4.6Aaron Kennedy2011-09-151-9/+16
* | | | | | QTBUG-21058: Fix for possible crashes in QTextControl::setCursorWidth()Mikko Knuutila2011-10-041-4/+4
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-teamJan-Arve Saether2011-10-048-61/+106
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-039-11/+12
| |\ \ \ \ \
| * | | | | | Fix bug in QGraphicsItem::isVisibleTo().Andreas Aardal Hanssen2011-09-291-9/+11
| * | | | | | nano-opts, styling fixesKonstantin Ritt2011-09-292-11/+11
| * | | | | | don't assume the PATH envvar is latin1-encodedKonstantin Ritt2011-09-291-1/+1
| * | | | | | Set missing flags in the option when rendering QTreeView drag pixmapDavid Faure2011-09-294-39/+82
| * | | | | | Fix typo when updating accessible treeview selection.Frederik Gladhorn2011-09-281-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-10-041-13/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge branch '4.8' into earth-staging-masterSinan Tanilkan2011-09-21707-8960/+16426
| |\ \ \ \ \
| * | | | | | Remove support for multiple cookies in one Set-Cookie header to follow RFC6265.Jocelyn Turcotte2011-09-161-13/+5
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...v4.8.0-rc1Qt Continuous Integration System2011-10-031-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-09-2724-280/+2342
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Fix possible crash in QFontEngineFTEskil Abrahamsen Blomfeldt2011-09-261-1/+1
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-10-038-10/+11
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add another part of the source code to the snippet.Casper van Donderen2011-09-301-0/+1
| * | | | | | | Update translation sources.Casper van Donderen2011-09-297-10/+10
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-09-277-13/+15
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-09-2242-3128/+3241
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Only limit cursor position when line is wrappedJiang Jiang2011-09-211-1/+1
| * | | | | | | Make sure cursor position doesn't exceed line endJiang Jiang2011-09-191-0/+3
| * | | | | | | Allow shared EGL contexts for xcb and xlib platformsReuben Dowle2011-09-192-2/+2
| * | | | | | | Allow generic EGL platform contexts to be sharedReuben Dowle2011-09-192-3/+4
| * | | | | | | stop tslib plugin having same file name as linux input pluginReuben Dowle2011-09-191-1/+1