summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-06-04Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵4.6Qt Continuous Integration System1-370/+392
4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: deprecate header files in $$QT_BUILD_TREE/include/Qt syncqt: tabs changes to spaces
2010-06-04deprecate header files in $$QT_BUILD_TREE/include/QtJoerg Bornemann1-4/+26
To resolve the header file conflict as described in QTBUG-10647, we * remove include/Qt/private * "syncqt -copy" creates in include/Qt local forwarding headers instead of header file copies In case of a conflict, e.g. qxmlstream.h, we include both header files. All header files in include/Qt now yield a preprocessor warning, if they're included. They should not be used and will vanish some day. Task-number: QTBUG-10647 Reviewed-by: ossi
2010-06-04syncqt: tabs changes to spacesJoerg Bornemann1-369/+369
2010-06-04Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System3-6/+40
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 ( d6d6c3821ed111b214a753f1ce8fa969c1a94dc3 )
2010-06-04Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann3-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
2010-06-03Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵4.6-stableQt Continuous Integration System2-4/+4
4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix misleading hint support TARGETs with spaces
2010-06-03fix misleading hintOswald Buddenhagen1-1/+1
it is "FOO=bar ./configure", not "./configure FOO=bar". Task-number: QTBUG-11058
2010-06-03support TARGETs with spacesOswald Buddenhagen1-3/+3
this is quite a hack, but the quoting is terminally broken anyway, so ... Task-number: QTBUG-10384
2010-06-03Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2-2/+2
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
2010-06-03propagate code change back to .g sourceOswald Buddenhagen1-1/+1
missed that in 60acaf5e
2010-06-03double-quote string which contains a single-quoteOswald Buddenhagen1-1/+1
qmake is just too forgiving ...
2010-06-03Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System1-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.
2010-06-03Fix the bindTexture() filters on X11 to not rely on mipmap generation.Trond Kjernåsen1-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
2010-06-03Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System14-36/+378
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
2010-06-03Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System1-1/+1
4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Windows CE: missing null check added in qapplication_win.cpp
2010-06-03Fix QWS build failureGareth Stockwell1-1/+1
Task-number: QTBUG-8697
2010-06-03Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System14-35/+377
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
2010-06-03Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System1-1/+1
4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Windows CE: missing null check added in qapplication_win.cpp
2010-06-03Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System1-0/+6
4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qmake: don't warn about unknown MSVC compiler option /MP
2010-06-03Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System14-35/+377
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
2010-06-03Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System1-0/+6
4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qmake: don't warn about unknown MSVC compiler option /MP
2010-06-02Removed compiler warningsGareth Stockwell6-2/+14
Emitted when building with MetroWerks x86 toolchain. Reviewed-by: trustme
2010-06-02qmake: don't warn about unknown MSVC compiler option /MPJoerg Bornemann1-0/+6
VCCLCompilerTool didn't know about the /MP option, which is available since Visual C++ 2005. Task-number: QTBUG-3252 Reviewed-by: ossi
2010-06-02Window visibility changes update TLW backing store reference countGareth Stockwell2-8/+17
* 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
2010-06-02Enable visibility change events on all Symbian native windowsGareth Stockwell1-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
2010-06-02Added reference counting to QWidgetBackingStoreGareth Stockwell8-29/+102
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
2010-06-02Added tst_QWidget::destroyBackingStoreWhenHiddenGareth Stockwell1-0/+247
Task-number: QTBUG-8697 Reviewed-by: Jason Barron
2010-06-02Windows CE: missing null check added in qapplication_win.cppJoerg Bornemann1-1/+1
Prevents possible crash on WM_SETTINGCHANGE. Task-number: QTBUG-11023 Reviewed-by: ckamm
2010-06-02Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System3-6/+48
4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Clipping with rounded rectangles and QVG_SCISSOR_CLIP
2010-06-02Clipping with rounded rectangles and QVG_SCISSOR_CLIPRhys Weatherley3-6/+48
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
2010-06-02Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System1-3/+0
4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove workarounds for -rpath-link options
2010-06-01Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System1-3/+0
4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove workarounds for -rpath-link options
2010-06-01Remove workarounds for -rpath-link optionsAdrian Constantin1-3/+0
Reviewed-by: Stefano Pironato
2010-06-01Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System1-0/+2
4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed alpha check for mono images.
2010-06-01Fixed alpha check for mono images.Kim Motoyoshi Kalland1-0/+2
Task-number: QTBUG-9072 Reviewed-by: Trond
2010-05-31Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System1-12/+0
4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Removed bogus autotest QFontMetrics::bearingIncludedInBoundingRect
2010-05-31Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System3-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 )
2010-05-31Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System1-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.
2010-05-31Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann3-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):
2010-05-31Always construct s60 screen furniture even if not used.Janne Koskinen1-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
2010-05-31Removed bogus autotest QFontMetrics::bearingIncludedInBoundingRectEskil Abrahamsen Blomfeldt1-12/+0
The assumption that italic text is wider than unstyled text is wrong, and will fail for some fonts. The only way to test this would be to create a custom font for it, but the test is not useful enough to warrant this, so it's been removed.
2010-05-31Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System5-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
2010-05-31Fix antialiasing with transformed text in OpenGL2 paint engineEskil Abrahamsen Blomfeldt5-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
2010-05-30Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2-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 )
2010-05-30Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2-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
2010-05-28Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System5-434/+76
4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Update def files for 4.6.3
2010-05-28Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System4-14/+44
4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: test QMultiMap::operator+= and QMultiHash::operator+= QMultiMap/QMultiHash: must qualify identifier to find this declaration in dependent base class
2010-05-28test QMultiMap::operator+= and QMultiHash::operator+=Olivier Goffart2-0/+40
2010-05-28QMultiMap/QMultiHash: must qualify identifier to find this declaration in ↵Olivier Goffart2-14/+4
dependent base class This is required as some compiler such as clang or rvct respect the standard more than gcc Reviewed-by: thiago Reviewed-by: hjk
2010-05-28Update def files for 4.6.3Shane Kearns5-434/+76
Frozen 4.6.3 branch on top of 4.6.2 def files. Task-number: QTBUG-8769 Reviewed-by: Trust Me
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 13:16:06 +0000