summaryrefslogtreecommitdiffstats
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-064-18/+14
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-10-061-9/+13
| |\
| | * Ukrainian translation updatedVictor Ostashevsky2011-10-061-9/+13
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-10-063-9/+1
| |\ \ | | |/
| | * Build fix for WINCE to qfilesystemengine_win.cppjaanttil2011-10-051-1/+0
| | * Fixed typo in QSettings documentation.Sam Protsenko2011-10-051-1/+1
| | * remove dead codeOswald Buddenhagen2011-10-041-7/+0
* | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-052-0/+2
|\ \ \ | |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-10-042-0/+2
| |\ \
| | * | Added Qt Quick Components link to documentEero Hyyti2011-10-042-0/+2
* | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-0449-431/+993
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-10-0425-317/+825
| |\ \ \ | | | |/ | | |/|
| | * | add integrity gbuild to the project file for convenienceOswald Buddenhagen2011-09-291-0/+2
| | * | don't build activeqt examples on mingwOswald Buddenhagen2011-09-291-1/+1
| | * | QNetworkAccessBackend::start() is used although QT_NO_BEARERMANAGEMENT is def...shkim2011-09-291-2/+0
| | * | Updated Russian translationSergey Belyashov2011-09-293-60/+124
| | * | Ukrainian translation updated for 4.8Victor Ostashevsky2011-09-284-215/+682
| | * | retreving -> retrievingAlbert Astals Cid2011-09-281-3/+3
| | * | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-09-28137-3638/+6887
| | |\ \
| | * | | Removed duplicate Spectrum Analyzer entry from demos doc page.jaanttil2011-09-271-7/+0
| | * | | Removed obsolete QWS_ALPHA_CURSOR feature.jaanttil2011-09-275-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-275-9/+9
| | * | | 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-0424-114/+168
| |\ \ \ \
| | * | | | 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-20952-12542/+39754
| | |\ \ \ \
| | | * \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-09-19760-7050/+16118
| | | |\ \ \ \
| | | | * | | | Debugger: Fix autotest breakageKai Koehne2011-09-191-1/+0
| | | | * | | | Debugger: Rename qdeclarativedebug* to qdeclarativeenginedebug*Kai Koehne2011-09-166-10/+7
| | | | * | | | Rename QDeclarativeEngineDebugServer to ~ServiceKai Koehne2011-09-1610-61/+58
| | | | * | | | Debugger: Move QT_DECLARATIVE_DEBUG handling out of qdeclarative.hKai Koehne2011-09-155-12/+71
| | | | * | | | Merge remote-tracking branch 'qt/4.8' into master-qmlKai Koehne2011-09-15744-6968/+15984
| | | | |\ \ \ \
| | | * | \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-08-302-16/+50
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | FocusScope's focusItem must always be a descendentAlan Alpert2011-08-302-16/+50
| | | * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-08-252-2/+5
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | QDeclarativeDebugJs: Disable unstable autotestKai Koehne2011-08-251-2/+4
| | | | * | | | | Add qdeclarativedebugjs autotests to declarative.proKai Koehne2011-08-241-0/+1
| | | * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-08-24177-3395/+18504
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | tests: Use CONFIG option instead of QDeclarativeDebugHelper classKai Koehne2011-08-248-17/+5
| | | * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-08-1216696-1090924/+2274267
| | | |\ \ \ \ \ \
| | * | | | | | | | 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