summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-109-162/+214
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-101-5/+13
| |\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Missing glyphs in GL when scaling QStaticText and QML text items
| | * Missing glyphs in GL when scaling QStaticText and QML text itemsEskil Abrahamsen Blomfeldt2010-12-101-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since scaled text is backed by an A8 glyph cache, it needs to repopulate even if it has previously populated the cache for the unscaled text. This means that we need to record in the userData that the type of the cache is not the same as the last time. Otherwise the A8 version of the cache will only be updated when it's created and when the text actually changes, leading to glyphs missing on screen when zooming text using a scale. Task-number: QTBUG-16012 Reviewed-by: Gunnar
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-102-4/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix path separator matching fix -dont-process for mingw cross-build fix nonsense condition Don't include <features.h> directly: non-standard header. Remove superfluous OpenGL linking for QtDeclarative
| | * | Don't include <features.h> directly: non-standard header.Thiago Macieira2010-12-101-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's completely wrong to assume that any Linux has features.h. Instead, include something that comes from the libc (like stdlib.h, which is specified by ISO C 89) and hope that __GLIBC__ gets defined. Specifically don't do this to stddef.h as that one comes from the compiler. Reviewed-by: Andreas Kling
| | * | Remove superfluous OpenGL linking for QtDeclarativeThiago Macieira2010-12-101-1/+0
| | |/
| * | Corrected case on Symbian library.axis2010-12-101-1/+1
| |/ | | | | | | RevBy: Trust me
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-092-4/+10
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Try using pure scissor clip in GL 2 engine for rotations. Fixed DeviceCoordinateCache items when using QGraphicsScene::render(). Fixed missing text in GL 2 engine after recreating a context. Fix compilation of qnetworkreply test with namespaces.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-092-4/+10
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Try using pure scissor clip in GL 2 engine for rotations. Fixed DeviceCoordinateCache items when using QGraphicsScene::render(). Fixed missing text in GL 2 engine after recreating a context. Fix compilation of qnetworkreply test with namespaces.
| | | * Try using pure scissor clip in GL 2 engine for rotations.Samuel Rødal2010-12-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As long as the final clip area is rectangular and axis aligned we can use a scissor clip. This prevents performance problems when doing 90-degree rotated rectangle clips. Reviewed-by: Bjørn Erik Nilsen
| | | * Fixed DeviceCoordinateCache items when using QGraphicsScene::render().Samuel Rødal2010-12-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since viewRect is null, we shouldn't try to use the partialCacheExposure path which intersects the viewRect with the device rect of the item. Task-number: QTBUG-15977 Reviewed-by: Bjørn Erik Nilsen
| | | * Fixed missing text in GL 2 engine after recreating a context.Samuel Rødal2010-12-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | If we recreate the texture glyph cache, we also need to repopulate. Reviewed-by: Eskil Abrahamsen Blomfeldt
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-094-148/+188
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Runtime dependency on Symbians Font Table API Add libinfix support for QML plugins in Symbian.
| | * | Runtime dependency on Symbians Font Table APIAlessandro Portale2010-12-093-147/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Symbian Font Table API is a feature from (the former) Symbian^4 which will be backported into Symbian^3 in a random minor OS version. In order to keep Qt source and binary compatible between these minor versions, we cannot decide at compile time whether or not to use the new Font Table API. This patch changes many "#ifdef Q_SYMBIAN_HAS_FONTTABLE_API" into "if (symbianFontTableApiAvailable())". The Font Table feature is detected at runtime. Currently, CFeatureDiscovery is not used, because at the time of writing, that feature flag test would give false positives or false negatives. Instead, CFont::ExtendedFunction() is called with KFontGetFontTable to see if the return value is KErrNone, which indicates that the feature is available. The avalibility information gets cached, so the hack happens only once per application run. The font table Api feature comes with helper classes such as "RFontTable" and "TGetFontTableParam". But we cannot use those, because we want to stay source and binary compatible across the Symbian(^3) versions without the Font table API and those with. So, in Qt, RFontTable is simply not used and TGetFontTableParam is replicated as "QSymbianTGetFontTableParam". Same for KFontGetFontTable, KFontReleaseFontTable and later also FfFontTable. This patch has been looked at by colleagues, who verified the overall #ifdef to if() conversion, but did not feel entitled to give their official Reviewed-By for an obscure topic like Qt font support on Symbian. (It sucks to be the only creature in this universe who -kind of- knows how Qt text handling and Symbian text handling interact) Task-Number: QTBUG-15515
| | * | Add libinfix support for QML plugins in Symbian.Miikka Heikkinen2010-12-091-1/+7
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14736 Reviewed-by: Alessandro Portale
* | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-097-8/+17
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2010-12-095-5/+15
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Remove whitespace and leading tab from documentation change Updating merge request 2512 QGraphicsLayoutItem - fix invalidating sizehint-with-constraints cache Fix integer overflow in bitfield Fix documentation for QML extended types Removes the reseting of the QMenu offset. Adding warning to QMenu documentation Fix filtering of columns in QSFPM.
| | * | Remove whitespace and leading tab from documentation changeSami Merila2010-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12119 Reviewed-by: TrustMe
| | * | Merge commit 'refs/merge-requests/2509' of gitorious.org:qt/qt into integrationSami Merila2010-12-081-0/+3
| | |\ \
| | | * | Adding warning to QMenu documentationKarim Pinter2010-11-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the QMenu is made visible using show() it causes problems because the scrolling and layout is not set properly. The warning suggests to use exec() or popup() instead. Task-number: QTBUG-12119
| | * | | Merge commit 'refs/merge-requests/2512' of gitorious.org:qt/qt into integrationSami Merila2010-12-071-0/+2
| | |\ \ \
| | | * | | Updating merge request 2512Karim Pinter2010-12-071-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing unnecessary comments and changing define to Q_OS_SYMBIAN. Task-number: QTBUG_9505
| | | * | | Removes the reseting of the QMenu offset.Karim Pinter2010-11-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On s60 when the qmenu is opened on the second time, it restores the position of the last activated menu, so there is no need to reset the offset when the popup() is called again. Task-number: QTBUG-9505
| | * | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-063-4/+18
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-031-0/+3
| | |\ \ \ \ \
| | * | | | | | QGraphicsLayoutItem - fix invalidating sizehint-with-constraints cacheJohn Tapsell2010-12-032-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jan-Arve Sæther
| | * | | | | | Fix integer overflow in bitfieldJan-Arve Sæther2010-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UnfeasibleConstraint is 4, and that does not fit in 2 bits. Spotted by Thiago Reviewed-by: Thiago
| | * | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-024-3/+42
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-0111-55/+121
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-3025-332/+659
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-291-3/+2
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-281-0/+1
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-2725-213/+246
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-2620-81/+258
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-2532-170/+647
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-2414-87/+118
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-232-1/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fix filtering of columns in QSFPM.Stephen Kelly2010-11-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a crash introduced in 315c09c3873f7c5d8b785443372bf975bae47ee7 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> Reviewed-by: Olivier
| * | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-12-0917-72/+133
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | QT::Window palette brush fails to render correctly.Jani Hautakangas2010-12-091-2/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QWidget uses QPainter::drawTiledPixmap to draw textured background brush but OpenVG paint engine fails to render pixmaps correctly because of incorrect offset calculation. Task-number: QTBUG-15737 Reviewed-by: Gunnar Sletta
| * | | | | | | | | | | | | | | | QLabel wordwrap to respect maximumSizeJanne Koskinen2010-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80 characters width can be longer than maximum size of QLabel. Restrict to max size. Task-number: QT-4354 Reviewed-by: Sami Merila
* | | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-0817-70/+139
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Prevent out-of-bounds memory access in drawhelper.Samuel Rødal2010-12-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The coordinates should be modulo the image width and height like for all the other tiled blend functions. Covered by perspectives.qps Task-number: QTBUG-15837 Reviewed-by: Olivier Goffart
| * | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-0810-54/+104
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Check Qt::WA_TranslucentBackground instead of custom widget property. New translucency API for the meego graphics system. Support for 'qglTranslucent' in QGLWindowSurface. Use a different dither distribution matrix + a bit of rand. Fixed cubic bezier rendering bug in qgrayraster. Revert "qgrayraster: Speed up rendering of small cubic splines." Fix QWingedEdge memory usage issue Make sure QMeeGoGraphicsSystem::setTranslucent can't be called if surface already created. Prevent always deep-copying in QPixmap::toImage() for raster pixmaps. Fix text disappearing on GL when RGB-path is taken (no transformation) Fix for GCC on Windows x64. Fix crash in QTextDocument::markContentsDirty Make sure to do a deep copy of a QImage when it's being painted on.
| | * | | | | | | | | | | | | | | | Check Qt::WA_TranslucentBackground instead of custom widget property.Michael Dominic K2010-12-081-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2523 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | | | | | | | | | | | | | | | Support for 'qglTranslucent' in QGLWindowSurface.Michael Dominic K2010-12-081-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2523 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | | | | | | | | | | | | | | | Use a different dither distribution matrix + a bit of rand.Michael Dominic K2010-12-081-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also don't dither on edges. Improves dithering over tiles/scaled smooth gradients. Merge-request: 971 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | | | | | | | | | | | | | | | Fixed cubic bezier rendering bug in qgrayraster.Samuel Rødal2010-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the y coordinates to compute the y delta... This could cause too fine (or too coarse) subdivision of cubic bezier curves, so potentially both performance problems and visual artifacts. Task-number: QTBUG-15660 Reviewed-by: Andreas Kling
| | * | | | | | | | | | | | | | | | Revert "qgrayraster: Speed up rendering of small cubic splines."Samuel Rødal2010-12-081-16/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a9c0fbd5e946ae6e90b6db6dd4aea64c824a4066. The subdivision code in the above commit messed up subdivision of cubic beziers, so we have to revert it. Task-number: QTBUG-15660 Reviewed-by: Andreas Kling
| | * | | | | | | | | | | | | | | | Fix QWingedEdge memory usage issueJiang Jiang2010-12-081-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QWingedEdge should reserve the amount of segments/edges/vertices in relative to the element count instead of length of the QPainterPath passed in. This problem is especially severe when QTextLayout using it to calculate the region for full line selection highlighting, because the region used QFIXED_MAX as right most coordinate, it will cost more than 2 GB of memory allocated just for it (recorded by valgrind on Mac OS X), and cause crash in systems short of memory. Task-number: QTBUG-15823 Reviewed-by: Samuel Rødal
generated by cgit v0.12 at 2024-12-28 17:59:41 (GMT)