summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* propagate code change back to .g sourceOswald Buddenhagen2010-06-031-1/+1
| | | | missed that in 60acaf5e
* 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-1 into ↵Qt Continuous Integration System2010-06-031-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
| * qmake: don't warn about unknown MSVC compiler option /MPJoerg Bornemann2010-06-021-0/+6
| | | | | | | | | | | | | | | | VCCLCompilerTool didn't know about the /MP option, which is available since Visual C++ 2005. Task-number: QTBUG-3252 Reviewed-by: ossi
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-023-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
| * | Clipping with rounded rectangles and QVG_SCISSOR_CLIPRhys Weatherley2010-06-023-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
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-021-3/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove workarounds for -rpath-link options
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-011-3/+0
| |\ \ |/ / / | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove workarounds for -rpath-link options
| * | Remove workarounds for -rpath-link optionsAdrian Constantin2010-06-011-3/+0
| | | | | | | | | | | | Reviewed-by: Stefano Pironato
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-011-0/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed alpha check for mono images.
| * | 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-2 into ↵Qt Continuous Integration System2010-05-311-12/+0
|\ \ | |/ |/| | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Removed bogus autotest QFontMetrics::bearingIncludedInBoundingRect
| * Removed bogus autotest QFontMetrics::bearingIncludedInBoundingRectEskil Abrahamsen Blomfeldt2010-05-311-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.
* | 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
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-284-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
| * | test QMultiMap::operator+= and QMultiHash::operator+=Olivier Goffart2010-05-282-0/+40
| | |
| * | QMultiMap/QMultiHash: must qualify identifier to find this declaration in ↵Olivier Goffart2010-05-282-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
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-281-2/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Handle exceptions notified by select before read/write.
| * | Handle exceptions notified by select before read/write.Janne Anttila2010-05-281-2/+2
| | | | | | | | | | | | | | | Task-number: MOBILITY-800 Reviewed-by: Aleksandar Sasha Babic
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-282-58/+63
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Added support for Indonesian language on Symbian. Fix for Norwegian and Korean languages on symbian. Added Korean and Nynorsk locales support on Symbian.
| * | | Added support for Indonesian language on Symbian.Denis Dzyubenko2010-05-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have support for ELangIndonesian, but we also need to support new ELangIndonesian_Apac which has appeared in Symbian^3. Task-number: QT-3369 Reviewed-by: trustme
| * | | Fix for Norwegian and Korean languages on symbian.Denis Dzyubenko2010-05-282-60/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Last commits added Norwegian Nynorsk and Korean locales support, however the array that contains the mapping between symbian locale constant and locale string should be sorted to work. Task-number: QT-3368 Task-number: QT-3370 Reviewed-by: trustme
| * | | Added Korean and Nynorsk locales support on Symbian.Denis Dzyubenko2010-05-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-3368 Task-number: QT-3370 Reviewed-by: Thiago Macieira
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-281-0/+41
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add missing license header.
| * | | Add missing license header.Jason McDonald2010-05-281-0/+41
|/ / / | | | | | | | | | Reviewed-by: Trust Me
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-272-9/+20
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixes for the s60theme tool
| * | Fixes for the s60theme toolAlessandro Portale2010-05-272-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main app did not return an error code but rather a int-converted boolean. When loading from .tdf files, the tool will now search for .svg files directly, if the part is not found in the .tdf file. Task-number: QTSIM-9
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-273-4/+7
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix regression with Qt::AlignRight on monospaced text in QTextLayout Back port change d85b149a5c7f3532f8e1a593a79298c9ae38a95f
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-273-4/+7
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix regression with Qt::AlignRight on monospaced text in QTextLayout Back port change d85b149a5c7f3532f8e1a593a79298c9ae38a95f
| | * Fix regression with Qt::AlignRight on monospaced text in QTextLayoutEskil Abrahamsen Blomfeldt2010-05-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For monospaced fonts, using the width (including the bearing) of the text to align it to the right hand side, will break alignment of columns of characters. To fix the problem, we go back to the old procedure, by using the advance of the text as basis of alignment instead. Done-by: thorbjorn Reviewed-by: Eskil
| | * Back port change d85b149a5c7f3532f8e1a593a79298c9ae38a95fEskil Abrahamsen Blomfeldt2010-05-273-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes right alignment of monospaced text, which was a regression in Qt 4.6.0. Initially it was fixed in Qt 4.7 only, but the regression was later deemed severe enough to fix in 4.6.x as well. Task-number: QTBUG-8864 Reviewed-by: thorbjorn
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-272-1/+5
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Post QResizeEvent from QSymbianControl::SizeChanged even when invisible Moved Symbian-specific .pro directive into symbian{} block
| * | Post QResizeEvent from QSymbianControl::SizeChanged even when invisibleGareth Stockwell2010-05-271-0/+3
| | | | | | | | | | | | | | | Task-number: QTBUG-10986 Reviewed-by: Jason Barron
| * | Moved Symbian-specific .pro directive into symbian{} blockGareth Stockwell2010-05-271-1/+2
| | | | | | | | | | | | Reviewed-by: Miikka Heikkinen
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-271-0/+24
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Added some changes for 4.6.3
| * | Added some changes for 4.6.3Jens Bache-Wiig2010-05-271-0/+24
| | |
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-271-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix compilation for tst_qtextcodec with QT_NO_CONCURRENT defined.
| * | | Fix compilation for tst_qtextcodec with QT_NO_CONCURRENT defined.Liang Qi2010-05-271-0/+4
| | | |
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-262-8/+305
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Allow auto-test to compile when using namespaces Fix regression in QVarLengthArray::operator=
| * | | Allow auto-test to compile when using namespacesJoão Abecasis2010-05-261-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-test added in 8060094144d6104659b8ce3b88d6f8b1e53cfb59 does not compile when using Qt in namespace, because Q_DECLARE_TYPEINFO needs to be used from inside QT_NAMESPACE. Wrapper macros added. Task-number: QTBUG-10978
| * | | Fix regression in QVarLengthArray::operator=João Abecasis2010-05-262-8/+304
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a serious regression wherei, under certain conditions, assignment would be treated as an append. This was due to poor tracking of container invariants inside realloc. From now on, after the allocation decision, s shall contain the number of elements in the array to be kept. Deleting extra elements in the old array needn't update this value. Instead, it needs to be updated once and if new elements are created afterwards. Auto-test greatly expanded to avoid future embarassments. Task-number: QTBUG-10978 Reviewed-by: Olivier Goffart Reviewed-by: Fabien Freling Olivier reviewed the patch, Fabien the auto-test.
generated by cgit v0.12 at 2024-12-02 00:54:32 (GMT)