summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-0823-69/+178
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits) I10n: Update German translations for 4.7.0 Fix a freetype link failure. Fix configure test for DirectFB Split Symbian bearer plugin into three platform specfic plugins Doc: Fixed whitespace in the other configuration file for zh_CN. Doc: Fixed whitespace in the Simplified Chinese doc configuration. Unbreak Linux build when qendian.h is included before qglobal.h Revert accidental commit of irrelevant stuff. Silly mondays.. Unbreak Linux build when qendian.h is included before qglobal.h Fix QApplication/QWidget to really take ownership of input contexts Added setting a hotspot on standard gestures Fixed GestureOverride event delivery in GraphicsView. add check-ts target to auto-asses translation completeness qt_ja_JP.ts => qt_ja.ts Fix incorrect \since tag XQuery test suite (and others): remove p4 dependency add docu about pixmaps being invalidated on qapp destruction remove somewhat misleading warning about x11 pixmap leak Disabled item view items use incorrect background color Update the mkspec for linux-icc: don't use jump tables in shlibs ...
| * Fix a freetype link failure.Anders Bakken2010-06-081-1/+2
| | | | | | | | | | | | | | | | | | qfontengine_ft.cpp uses the function FT_GlyphSlot_Embolden but ftsynth.c (where the function is implmented) isn't compiled in when QT_CONFIG contains freetype. Merge-request: 672 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Split Symbian bearer plugin into three platform specfic pluginsAaron McCarthy2010-06-087-47/+81
| | | | | | | | | | | | | | | | Symbian bearer plugin has more functionality when built for newer platforms, so split the plugin into three platform specific plugins, and deploy the correct one depending on what the device supports. Written by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-0815-21/+95
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits) Doc: Fixed whitespace in the other configuration file for zh_CN. Doc: Fixed whitespace in the Simplified Chinese doc configuration. Unbreak Linux build when qendian.h is included before qglobal.h Revert accidental commit of irrelevant stuff. Silly mondays.. Unbreak Linux build when qendian.h is included before qglobal.h Fix QApplication/QWidget to really take ownership of input contexts Added setting a hotspot on standard gestures Fixed GestureOverride event delivery in GraphicsView. add check-ts target to auto-asses translation completeness qt_ja_JP.ts => qt_ja.ts Fix incorrect \since tag XQuery test suite (and others): remove p4 dependency add docu about pixmaps being invalidated on qapp destruction remove somewhat misleading warning about x11 pixmap leak Disabled item view items use incorrect background color Update the mkspec for linux-icc: don't use jump tables in shlibs Update the linux-icc mkspec * Add Japanese tutorial documents make corewlan more namespace friendly Add convenience constructor to QTextOption::Tab ...
| | * Unbreak Linux build when qendian.h is included before qglobal.hAndreas Kling2010-06-071-0/+1
| | |
| | * Revert accidental commit of irrelevant stuff. Silly mondays..Andreas Kling2010-06-073-35/+25
| | | | | | | | | | | | This reverts commit dfbd44c8ec75d3b0156547ef3fb5811a4548a0a5.
| | * Unbreak Linux build when qendian.h is included before qglobal.hAndreas Kling2010-06-073-25/+35
| | |
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Denis Dzyubenko2010-06-07187-886/+2810
| | |\ | | | | | | | | | | | | 4.7-staging1
| | | * Fix incorrect \since tagSimon Hausmann2010-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the since added in 51fa7df978d71a366c95c732d6a8c2576690d63a from 4.6 to 4.7 Pointed out by Thorbjoern :) Reviewed-by: Trust me
| | | * add docu about pixmaps being invalidated on qapp destructionOswald Buddenhagen2010-06-071-0/+3
| | | | | | | | | | | | | | | | Reviewed-by: jbache
| | | * remove somewhat misleading warning about x11 pixmap leakOswald Buddenhagen2010-06-071-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the only situation where it would be actually true are broken drivers (or a broken x server as a whole). qt is not the right place to worry about that problem. Reviewed-by: jbache
| | | * Disabled item view items use incorrect background colorJens Bache-Wiig2010-06-072-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a problem when using alternate row colors. We use a separate palette for base/alternate when using disabled colors. However, we should only use this if the entire view is disabled. To keep compatibility with style sheets we have to preserve the disabled state per item, but we now use the widget pointer to decide which palette role to use. Task-number: QTBUG-11263 Reviewed-by: ogoffart
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-076-11/+65
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: make corewlan more namespace friendly Add convenience constructor to QTextOption::Tab Make qbswap() use glibc's fast bswap_*() functions if available. Fix in Addressbook tutorial Avoid timer starvation during high posted event activity fix for using .lnk files when running app from UNC
| | | | * make corewlan more namespace friendlyLorn Potter2010-06-061-8/+17
| | | | |
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-055-3/+48
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add convenience constructor to QTextOption::Tab Make qbswap() use glibc's fast bswap_*() functions if available. Fix in Addressbook tutorial Avoid timer starvation during high posted event activity fix for using .lnk files when running app from UNC
| | | | | * Add convenience constructor to QTextOption::TabDavid Faure2010-06-042-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1734 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| | | | | * Make qbswap() use glibc's fast bswap_*() functions if available.Andreas Kling2010-06-041-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thiago Macieira
| | | | | * Avoid timer starvation during high posted event activityBradley T. Hughes2010-06-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to commit bc01bb10da23d0d2308cf02a16947be836bc9a21, we need to avoid starvation of the idle time source by forcing a single, normal priority pass after processing posted events. Reviewed-by: ogoffart Task-number: QT-3467
| | | | | * fix for using .lnk files when running app from UNCZeno Albisser2010-06-041-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since "" is an invalid target for a .lnk file, we can return false for doStat() in case of resolving the .lnk to "". Notice that .lnk files only allow absolute paths for the target. "" is returned by readLink in case the .lnk file does not exist. Reviewed-by: Joao Task-Number: QTBUG-10863
| | * | | | Fix QApplication/QWidget to really take ownership of input contextsMichael Hasselmann2010-06-072-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * src/gui/kernel/[qapplication|qwidget].cpp, tests/auto/qapplication/tst_[qapplication|qwidget].cpp (setInputContext): The documentation for [QApplication|QWidget]::setInputContext claims that the [QApplication|QWidget] instance would take ownership. This commit fixes the setter to also reparent the input context. Furthermore, the crappy test for this setter was improved. Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| | * | | | Added setting a hotspot on standard gesturesDenis Dzyubenko2010-06-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order for gestures to work in graphicsview the hotspot should be set. The fix adds the hotspot to standard gestures that are shipped with Qt. Task-number: QTBUG-10967 Task-number: QT-3406 Reviewed-by: trustme
| | * | | | Fixed GestureOverride event delivery in GraphicsView.Denis Dzyubenko2010-06-071-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GestureOverride event was not respected when delivering to items in GraphicsView. Task-number: QTBUG-10745 Reviewed-by: Thomas Zander
| | * | | | Reset gesture when in MayBeGesture state.Denis Dzyubenko2010-06-021-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a gesture recognizer switches from MayBeGesture to Cancelled gesture we need to reset the state of the recognizer, but do not send any events to the user. Reviewed-by: Thomas Zander
* | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-06-0825-57/+195
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp src/3rdparty/webkit/WebKit/qt/ChangeLog src/gui/painting/qpainter.cpp src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtNetworku.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qfontmetrics/tst_qfontmetrics.cpp tools/linguist/lupdate/main.cpp
| * | | | | Fix style sheet error with slider handleqCaro2010-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier
| * | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-06-043-6/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( d6d6c3821ed111b214a753f1ce8fa969c1a94dc3 ) Changes in WebKit/qt since the last update: * https://bugs.webkit.org/show_bug.cgi?id=36832 -- [Qt] Destroy SharedTimerQt before destruction of QCoreApplication. Task-number: QT-3393
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-031-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: propagate code change back to .g source double-quote string which contains a single-quote
| | * | | | | double-quote string which contains a single-quoteOswald Buddenhagen2010-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | qmake is just too forgiving ...
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-031-0/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix the bindTexture() filters on X11 to not rely on mipmap generation.
| | * | | | | | Fix the bindTexture() filters on X11 to not rely on mipmap generation.Trond Kjernåsen2010-06-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default GL_TEXTURE_MIN_FILTER is GL_NEAREST_MIPMAP_LINEAR, which means you have to have mipmaps generated in order for it to produce correct results. We don't use mipmaps when this particular path is taken, so use texture filters that is in line with what we do in the non-pixmap_to_texture path. Task-number: QTBUG-11158 Reviewed-by: Kim
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-0313-28/+128
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix QWS build failure Removed compiler warnings Window visibility changes update TLW backing store reference count Enable visibility change events on all Symbian native windows Added reference counting to QWidgetBackingStore Added tst_QWidget::destroyBackingStoreWhenHidden
| | * | | | | | Fix QWS build failureGareth Stockwell2010-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8697
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-0313-27/+127
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Removed compiler warnings Window visibility changes update TLW backing store reference count Enable visibility change events on all Symbian native windows Added reference counting to QWidgetBackingStore Added tst_QWidget::destroyBackingStoreWhenHidden
| | | * | | | | Removed compiler warningsGareth Stockwell2010-06-026-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emitted when building with MetroWerks x86 toolchain. Reviewed-by: trustme
| | | * | | | | Window visibility changes update TLW backing store reference countGareth Stockwell2010-06-021-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * When a native window becomes completely invisible, the reference count of the top-level widget's backing store is decremented. * When a previously invisible native window becomes either partially or fully visible: - If the top-level widget has a backing store, its reference count is incremented. - Otherwise, the top-level widget creates a backing store with an initial reference count of 1. Task-number: QTBUG-8697 Reviewed-by: Jason Barron
| | | * | | | | Enable visibility change events on all Symbian native windowsGareth Stockwell2010-06-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, these events were enabled only on top-level widgets. This patch enables them also for native child widgets. Task-number: QTBUG-8697 Reviewed-by: Jason Barron
| | | * | | | | Added reference counting to QWidgetBackingStoreGareth Stockwell2010-06-027-20/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Symbian, the top-level widget's backing store must be destroyed when it is no longer required, in order to conserve memory. The criteria for destroying the backing store is when neither the TLW nor any of its native descendents (which share the backing store) are visible. In order to implement this requirement, a count must be kept of the number of native widgets which are using the TLW's backing store. This patch provides the mechanism for maintaining this count, and for destroying the backing store when the count is decremented to zero. No calls to either the increment nor decrement functions are made, however, by this code included in this patch; this code will be added to only the Symbian backend by a subsequent patch. Task-number: QTBUG-8697 Reviewed-by: Bjørn Erik Nilsen Reviewed-by: Jason Barron
| * | | | | | | Windows CE: missing null check added in qapplication_win.cppJoerg Bornemann2010-06-021-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents possible crash on WM_SETTINGCHANGE. Task-number: QTBUG-11023 Reviewed-by: ckamm
| * | | | | | Clipping with rounded rectangles and QVG_SCISSOR_CLIPRhys Weatherley2010-06-021-4/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebKit draws rounded rectangles by setting a rounded rect path as a clip and then filling the clip. This had problems when QVG_SCISSOR_CLIP was enabled because the scissor would only clip to the bounding box of complex paths. Thus, rounded rectangle clips were turned into normal rectangle clips. This change will make the scissor clipping code subdivide complex paths into rectangles and use a tighter clip if the number of rectangles is less than or equal to VG_MAX_SCISSOR_RECTS. If it is greater, then it will fall back to the bounding box of the path. Task-number: QT-3372 Reviewed-by: Jason Barron
| * | | | | | Fixed alpha check for mono images.Kim Motoyoshi Kalland2010-06-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9072 Reviewed-by: Trond
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-313-2/+12
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( b9dcd9c168d9b25deb020837a67f30c2d72c9afb )
| | * | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-05-313-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( b9dcd9c168d9b25deb020837a67f30c2d72c9afb ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2010-05-19 Denis Dzyubenko <denis.dzyubenko@nokia.com> Reviewed by Kenneth Rohde Christiansen. When creating the UA, do not sassmue the language code is a two-letter iso639-1 code. * Api/qwebpage.cpp: (QWebPage::userAgentForUrl):
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-311-4/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Always construct s60 screen furniture even if not used.
| | * | | | | | Always construct s60 screen furniture even if not used.Janne Koskinen2010-05-311-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not creating screen furniture in full screen caused regression when swapping into idle screen and back on Nokia 5800. Task-number: QTBUG-10985 Reviewed-by: Jason Barron
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-315-4/+13
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix antialiasing with transformed text in OpenGL2 paint engine
| | * | | | | | Fix antialiasing with transformed text in OpenGL2 paint engineEskil Abrahamsen Blomfeldt2010-05-315-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the paint engine now transforms the prerendered glyphs instead of rendering transformed glyphs as paths, we need to turn on texture filtering to avoid antialiasing artifacts. In order to do this, we also need to pad the glyphs in the glyph cache, otherwise you will get artifacts when sampling the area around the glyph's bounding rect (where there might be other glyphs.) This done by adding a glyphPadding() function to the cache which returns the number of pixels to pad between each glyph. Updated: This also fixes a general issue where some combinations of font sizes and transformations will cause the engine to sample neighbouring glyphs, so this has been backported to Qt 4.6.x. Task-number: QTBUG-9706, QTBUG-11028 Reviewed-by: Tom Conflicts: src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-302-12/+28
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 3bb0df4f00fa0b3ac3abc1b6fe508080fabdeaab )
| | * | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-05-302-12/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 3bb0df4f00fa0b3ac3abc1b6fe508080fabdeaab ) Changes in WebKit/qt since the last update: * [Qt] Update the Symbian version for the user agent -- https://bugs.webkit.org/show_bug.cgi?id=38389
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-285-434/+76
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Update def files for 4.6.3
| | * | | | | | Update def files for 4.6.3Shane Kearns2010-05-285-434/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Frozen 4.6.3 branch on top of 4.6.2 def files. Task-number: QTBUG-8769 Reviewed-by: Trust Me