summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Make Symbian follow Windows code in temporary path generationJoão Abecasis2011-08-171-8/+5
* Encapsulate pointer manipulations to createFileTemplate functionJoão Abecasis2011-08-171-15/+18
* Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-161-2/+2
|\
| * Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-161-2/+2
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-161-2/+2
| | |\
| | | * Disabled splitscreen translation still moves screenSami Merila2011-08-161-2/+2
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-161-17/+25
|\ \ \ \ | |/ / / |/| | |
| * | | Minor optimizations for QTextEngineRitt Konstantin2011-08-081-17/+25
* | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-164-3/+15
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-151-0/+1
| |\ \ \
| | * | | Join user state of removed text blocksLeandro Melo2011-08-151-0/+1
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-121-0/+1
| |\ \ \ \ | | |/ / /
| | * | | Missed break of switch-case addedViktor Kolesnyk2011-08-121-0/+1
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-122-3/+24
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fix softkeys cleanupMiikka Heikkinen2011-08-121-2/+12
| | * | | Fix clientRect usage in QWidgetPrivate::setGeometry_sys()Miikka Heikkinen2011-08-111-1/+1
| | * | | Do not allow fullscreen/maximized windows to expand beyond client rectMiikka Heikkinen2011-08-111-7/+9
| | * | | Do not modify window size for fullscreen windows in setGeometry_sysMiikka Heikkinen2011-08-111-1/+10
* | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-1543-2930/+7779
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-1543-2930/+7779
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-082-2/+2
| | |\ \ \ \ | | | |/ / / | | | | / / | | | |/ / | | |/| |
| | | * | Fix undesirable VKB popup at task switchMiikka Heikkinen2011-08-082-2/+2
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-058-12/+32
| | |\ \ \ | | | |/ /
| | | * | Fix compile errors on S60 3.2Shane Kearns2011-08-056-11/+11
| | | * | Fix to QGLWidget rendering with VG graphics systemJani Hautakangas2011-08-052-1/+21
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-041-3/+3
| | |\ \ \ | | | |/ /
| | | * | Fix installation on S60 5.0Shane Kearns2011-08-041-3/+3
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-08-041-2/+6
| | |\ \ \
| | | * | | Move cursorDelegate with the mouse selection of read only text input.Andrew den Exter2011-08-041-2/+6
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-08-03127-52415/+26133
| | |\ \ \ \
| | | * | | | Updating libpng: Patches to libpng 1.5.4 for building it in Qtaavit2011-08-022-5/+18
| | | * | | | Updating libpng: Add libpng version 1.5.4aavit2011-08-0241-0/+59715
| | | * | | | Updating libpng: Remove version 1.4.0aavit2011-08-02124-86010/+0
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-021-107/+0
| | |\ \ \ \ \
| | | * | | | | Remove DerivedSources.pro from WebKit.Jocelyn Turcotte2011-08-021-107/+0
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-08-151-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | HTTP internals: send password even if no username is setRobert Hogan2011-08-151-2/+2
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-121-13/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Always disconnect signals on aborted reply objectsBea Lam2011-08-121-13/+15
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-1233-163/+66
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | / / / / / / / | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-08-1114341-1078114/+2187257
| |\ \ \ \ \ \ \
| * | | | | | | | QmlInspector: Fix moc errorKai Koehne2011-08-111-1/+0
| * | | | | | | | QmlInspector: Fix compile for QT_NO_CURSORKai Koehne2011-08-103-0/+6
| * | | | | | | | QmlInspector: Remove unused toolbarKai Koehne2011-08-1026-136/+2
| * | | | | | | | JSDebugger: Only hit breakpoints in user codeKai Koehne2011-08-101-18/+15
| * | | | | | | | Prevent Binding from crashing when its target object is deleted.Michael Brasser2011-08-031-1/+2
| * | | | | | | | Fix crash when assigning a list property to transitions.Michael Brasser2011-07-261-1/+34
| * | | | | | | | Qml Debugging: only read properties that can be displayed in the debuggerChristiaan Janssen2011-07-202-7/+8
* | | | | | | | | Avoid spurious detaching in QDir::to/fromNativeSeparatorsJoão Abecasis2011-08-111-10/+28
* | | | | | | | | Use fromLocal8Bit for reversing toLocal8BitJoão Abecasis2011-08-111-1/+1