summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-075-15/+18
|\
| * Fixed bug and performance problem in windowsstyle.Samuel Rødal2011-01-071-2/+2
| * Restored old flushing behavior in -graphicssystem opengl on desktop.Samuel Rødal2011-01-071-3/+4
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-061-2/+4
| |\
| | * Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANsShane Kearns2011-01-061-2/+4
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-062-8/+8
| |\ \
| | * | QUrl::setUrl should call detachOlivier Goffart2011-01-061-0/+1
| | * | qkeymapper_x11.cpp: fix compilation with LSB and without XKBOlivier Goffart2011-01-061-8/+7
| | |/
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2011-01-072-42/+41
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2011-01-062-42/+41
| |\ \ \
| | * \ \ Merge commit 'qt-releng-review/master'Eckhart Koppen2011-01-062-42/+41
| | |\ \ \
| | | * | | Remove unnecessarily frozen functions from QtOpenGL WINSCW DEF fileEckhart Koppen2011-01-061-124/+0
| | | * | | Updated QTOpenGL DEF files for WINSCW and ARMV5Eckhart Koppen2011-01-062-39/+162
| | | * | | Updated DEF files for QtOpenGL for WINSCW and ARMV5Eckhart Koppen2011-01-052-2/+2
* | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-01-063-30/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-063-30/+10
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| |
| | * | | PathView crashed when the path is provided with undefined values.Martin Jones2011-01-061-1/+7
| | * | | PathView: update modelCount before attempting to regenerate delegates.Martin Jones2011-01-061-1/+3
| | | |/ | | |/|
| | * | Doc fixes for introduction page and Item docsBea Lam2011-01-061-28/+0
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-01-062-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | QHostInfoCache: Use QElapsedTime instead of QTimeNiklas Kurkisuo2011-01-062-3/+3
* | | | Cocoa: add support for QEventLoop::ExcludeUserInputEventsRichard Moe Gustavsen2011-01-061-1/+4
|/ / /
* | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-01-054-8/+19
|\ \ \
| * \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-054-8/+19
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Support for swap modes in QGLWindowSurface.Michael Dominic K2011-01-042-1/+15
| | * Pre-create the GL share widget before window surface creation.Michael Dominic K2011-01-041-6/+2
| | * Fixed first element being a LineToElement in QPainterPath::connectPath()Samuel Rødal2011-01-041-1/+2
* | | Added warning if <QGLFunctions> is included when GLEW is present.Samuel Rødal2011-01-051-0/+5
|/ /
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-01-041-0/+2
|\ \
| * | Allow QWidget with size larger than 16383 on Mac OS X (Cocoa)Prasanth Ullattil2011-01-041-0/+2
* | | Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2011-01-0412-31/+514
|\ \ \ | |/ / |/| |
| * | Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-3012-31/+514
| |\ \
| | * \ Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-3012-31/+514
| | |\ \
| | | * \ Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-2412-31/+514
| | | |\ \
| | | | * \ Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-2412-31/+514
| | | | |\ \
| | | | | * \ Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-2312-31/+514
| | | | | |\ \
| | | | | | * \ Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-2212-31/+514
| | | | | | |\ \
| | | | | | | * \ Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-2112-31/+514
| | | | | | | |\ \
| | | | | | | | * \ Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-2112-31/+514
| | | | | | | | |\ \
| | | | | | | | | * | Update def filesShane Kearns2010-12-206-19/+237
| | | | | | | | | * | QFile API: add API to specify if adopted file handles should be closedShane Kearns2010-12-206-12/+277
* | | | | | | | | | | Set no brush when the brush is a solid patern transparent color.Pierre Rossi2011-01-041-0/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-301-0/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Clear WSERV content when a native child receives an "expose"Jason Barron2010-12-291-0/+8
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-244-11/+98
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-244-11/+98
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-244-11/+98
| | |\ \ \ \ \ \ \
| | | * | | | | | | Prevented infinite loop in QMoviePrivate::next().Samuel Rødal2010-12-221-1/+5
| | | * | | | | | | Added int overloads to QPoint operator* and operator*=.Samuel Rødal2010-12-222-9/+92
| | | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-211-1/+1
| | | |\ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |