summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-08-2416-75/+303
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Fix QGLGlyphCache for Open GL ES (1).Eike Ziller2011-08-241-15/+20
| | | * | | | | | | | | | | | | | | | | | Revert "Include trailing space width in RTL text line width"Eskil Abrahamsen Blomfeldt2011-08-241-5/+1
| | | * | | | | | | | | | | | | | | | | | Fix justification of RTL textEskil Abrahamsen Blomfeldt2011-08-241-1/+2
| | | * | | | | | | | | | | | | | | | | | uikit: fix examples to no longer ship the custom fontsEike Ziller2011-08-242-12/+0
| | | * | | | | | | | | | | | | | | | | | Use CoreText for font rendering on uikit.Eike Ziller2011-08-2413-42/+280
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-08-272-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | Check if bridge plugin vector is still valid.Frederik Gladhorn2011-08-261-1/+1
| | * | | | | | | | | | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-08-253-6/+44
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | QWindowsStyle: fix bug in eventFilter on KeyPressed event with alt pressed: i...peterpa2011-08-251-2/+5
| | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-08-274-87/+166
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Revert "Don't second-guess the "engine"; call cleanPath on absolutePaths"João Abecasis2011-08-261-2/+8
| | * | | | | | | | | | | | | | | | | | | Revert "In 4.7 QFileInfo::absolute(File)Path returned clean paths"João Abecasis2011-08-261-3/+1
| | * | | | | | | | | | | | | | | | | | | In 4.7 QFileInfo::absolute(File)Path returned clean pathsJoão Abecasis2011-08-261-1/+3
| | * | | | | | | | | | | | | | | | | | | ret is an "internal" path, no need to re-process itJoão Abecasis2011-08-261-1/+1
| | * | | | | | | | | | | | | | | | | | | We prefer capitalized drive letters, make it so soonerJoão Abecasis2011-08-261-2/+3
| | * | | | | | | | | | | | | | | | | | | Don't second-guess the "engine"; call cleanPath on absolutePathsJoão Abecasis2011-08-261-8/+2
| | * | | | | | | | | | | | | | | | | | | Compare non-canonical paths before falling back on expensive computationJoão Abecasis2011-08-262-0/+9
| | * | | | | | | | | | | | | | | | | | | Fix QDir::operator==(const QDir &) constJoão Abecasis2011-08-262-3/+4
| | * | | | | | | | | | | | | | | | | | | Off-by-one error in assert condition...João Abecasis2011-08-221-1/+1
| | * | | | | | | | | | | | | | | | | | | Leftovers from 401722ef9e6fe79bd41f9d5f79668f5c4997c8e6João Abecasis2011-08-181-14/+0
| | * | | | | | | | | | | | | | | | | | | Fix QTemporaryFile regressions and new found issuesJoão Abecasis2011-08-171-50/+34
| | * | | | | | | | | | | | | | | | | | | Use "native paths" on POSIX platforms as wellJoão Abecasis2011-08-171-27/+3
| | * | | | | | | | | | | | | | | | | | | Cleanup #includesJoão Abecasis2011-08-171-2/+0
| | * | | | | | | | | | | | | | | | | | | Atomic implementation of create file and obtain handle for Win/SymbianJoão Abecasis2011-08-171-49/+102
| | * | | | | | | | | | | | | | | | | | | Minimize encoding conversions when generating unique file nameJoão Abecasis2011-08-171-15/+54
| | * | | | | | | | | | | | | | | | | | | Use QStringBuilder when copying template for modificationJoão Abecasis2011-08-171-15/+47
| | * | | | | | | | | | | | | | | | | | | 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-2735-222/+232
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-262-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | / / / / / / / / / / / / / | | | |_|_|_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Fix memory leak in ListModel custom parserBea Lam2011-08-251-0/+1
| | * | | | | | | | | | | | | | | | | | | Correct documentation of TextInput.PasswordEchoOnEdit.Andrew den Exter2011-08-221-1/+2
| * | | | | | | | | | | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-253-6/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-244-39/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Fixed lost flushes in raster window surface.Samuel Rødal2011-08-221-10/+11
| | * | | | | | | | | | | | | | | | | | | uikit: Use correct pixmap data format.Eike Ziller2011-08-191-1/+1
| | * | | | | | | | | | | | | | | | | | | Correctly position aliased lines with flat capsLars Knoll2011-08-192-28/+32
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-08-241-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.8' into 4.8-tools-stagingJoerg Bornemann2011-08-233-6/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Fix compilation of qjpeg on MinGW with GCC 4.6Thiago Macieira2011-08-191-0/+5
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-08-2311-21/+91
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-08-185-11/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | Make the DBus timeout configurable in QDBusAbstractInterface.David Faure2011-08-183-4/+31
| | * | | | | | | | | | | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-08-171-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | Add a QApplication::queryKeyboardModifiers() method.David Faure2011-08-178-17/+60
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-193-6/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-08-1919-93/+121
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Doc: Fixed qdoc warnings.David Boddie2011-08-1517-88/+117
| | * | | | | | | | | | | | | | | | | | | | | | Doc: Fixed qdoc warnings.David Boddie2011-08-152-4/+2