summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/master'Olivier Goffart2010-06-15202-786/+2862
|\
| * Adjust handling of library .bundle on MacZeno Albisser2010-06-111-4/+8
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-06-111-3/+21
| |\
| | * Avoid the incorrect usage of QScopedArrayPointer.Denis Dzyubenko2010-06-111-3/+21
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-06-113-3/+46
| |\ \
| | * | Export QDeclarativeAbstractAnimation and QDeclarativeScriptActionMarco Bubke2010-06-101-2/+2
| | * | Add count, at and clear to flickableDataMarco Bubke2010-06-092-1/+44
| | |/
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-06-08197-776/+2787
| |\ \ | | |/ | |/|
| | * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-06-0825-57/+195
| | |\
| | | * Fix style sheet error with slider handleqCaro2010-06-071-1/+1
| | | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-043-6/+40
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-031-1/+1
| | | |\
| | | | * double-quote string which contains a single-quoteOswald Buddenhagen2010-06-031-1/+1
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-031-0/+3
| | | |\ \
| | | | * | Fix the bindTexture() filters on X11 to not rely on mipmap generation.Trond Kjernåsen2010-06-031-0/+3
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-0313-28/+128
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Fix QWS build failureGareth Stockwell2010-06-031-1/+1
| | | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-0313-27/+127
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * Removed compiler warningsGareth Stockwell2010-06-026-2/+14
| | | | | * Window visibility changes update TLW backing store reference countGareth Stockwell2010-06-021-7/+16
| | | | | * Enable visibility change events on all Symbian native windowsGareth Stockwell2010-06-021-0/+1
| | | | | * Added reference counting to QWidgetBackingStoreGareth Stockwell2010-06-027-20/+98
| | | * | | Windows CE: missing null check added in qapplication_win.cppJoerg Bornemann2010-06-021-1/+1
| | | |/ /
| | | * | Clipping with rounded rectangles and QVG_SCISSOR_CLIPRhys Weatherley2010-06-021-4/+41
| | | * | Fixed alpha check for mono images.Kim Motoyoshi Kalland2010-06-011-0/+2
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-313-2/+12
| | | |\ \ | | | | |/ | | | |/|
| | | | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-05-313-2/+12
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-311-4/+1
| | | |\ \
| | | | * | Always construct s60 screen furniture even if not used.Janne Koskinen2010-05-311-4/+1
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-315-4/+13
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Fix antialiasing with transformed text in OpenGL2 paint engineEskil Abrahamsen Blomfeldt2010-05-315-4/+13
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-302-12/+28
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-05-302-12/+28
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-285-434/+76
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Update def files for 4.6.3Shane Kearns2010-05-285-434/+76
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-282-14/+4
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | QMultiMap/QMultiHash: must qualify identifier to find this declaration in de...Olivier Goffart2010-05-282-14/+4
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-281-2/+2
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Handle exceptions notified by select before read/write.Janne Anttila2010-05-281-2/+2
| | | | |/
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-282-58/+63
| | | |\ \ | | | | |/ | | | |/|
| | | | * Added support for Indonesian language on Symbian.Denis Dzyubenko2010-05-281-1/+2
| | | | * Fix for Norwegian and Korean languages on symbian.Denis Dzyubenko2010-05-282-60/+62
| | | | * Added Korean and Nynorsk locales support on Symbian.Denis Dzyubenko2010-05-281-0/+2
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-273-4/+7
| | | |\ \
| | | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-273-4/+7
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * Fix regression with Qt::AlignRight on monospaced text in QTextLayoutEskil Abrahamsen Blomfeldt2010-05-271-2/+2
| | | | | * Back port change d85b149a5c7f3532f8e1a593a79298c9ae38a95fEskil Abrahamsen Blomfeldt2010-05-273-2/+5
| | | * | | Post QResizeEvent from QSymbianControl::SizeChanged even when invisibleGareth Stockwell2010-05-271-0/+3
| | | |/ /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-076-25/+153
| | |\ \ \
| | | * | | New keys for media-related keys, common mobile keysIain2010-06-073-18/+45