summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of ../qt-doc-team into 4.7David Boddie2010-09-14238-5528/+10285
|\
| * Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-1346-246/+697
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-131-0/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix compile error for runonphone on linux/gcc4.4.3
| | | * Fix compile error for runonphone on linux/gcc4.4.3Adenilson Cavalcanti da Silva2010-09-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it build: - fixing missing prototype declaration - explicit inclusion header file Merge-request: 813 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-1310-95/+46
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Use the stream operation for the SSE2 implementation of memfill32 Remove the memory safety for the first scanline of the SSSE3 blending tests: fix compilation with suncc Assertion calledEmitUpdated fails in QGraphicsScene. Linux: Fix mispositioned, misclipped glyphs in large fonts (QStaticText)
| | | * | Use the stream operation for the SSE2 implementation of memfill32Benjamin Poulain2010-09-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Writing the data of memfill() to a cacheline is unecessary because the data is not reused directly. We can use the stream operations to avoid the cache completely. When testing memfill32 separately, the function is twice as fast on Core2 and Atom. Reviewed-by: Samuel Rødal
| | | * | Remove the memory safety for the first scanline of the SSSE3 blendingBenjamin Poulain2010-09-131-72/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Memory is allocated on 16 bytes boundaries. We can do the aligned load without risking a invalid memory access. This simplify the code. Reviewed-by: Samuel Rødal
| | | * | tests: fix compilation with sunccOlivier Goffart2010-09-135-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch derived from the tasks Task-number: QTBUG-12997 Task-number: QTBUG-12984 Task-number: QTBUG-12985 Task-number: QTBUG-12990 Task-number: QTBUG-12999
| | | * | Assertion calledEmitUpdated fails in QGraphicsScene.Bjørn Erik Nilsen2010-09-132-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was that the 'updateAll' boolean was reset to 'false' when it really should have been unchanged. This happened when rendering the scene from outside the view's paint event (i.e. from QGraphicsView/Scene::render). We only want to reset 'updateAll' when triggering drawItems() from QGraphicsView::paintEvent, i.e. when the 'view' pointer != 0. Broke after commit: dda8a57c. Auto test included. Task-number: QT-3674
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-09-1333-85/+557
| | | |\ \
| | | * | | Linux: Fix mispositioned, misclipped glyphs in large fonts (QStaticText)Eskil Abrahamsen Blomfeldt2010-09-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While drawText() will use the path fallback for large fonts, and never hit this problem, QStaticText will draw the large fonts into the glyph cache. This broke when the freetype (or any other font engine) falls back to the generic implementation of alphaMapForGlyph() which uses path drawing. The problem was that alphaMapForGlyph() is not supposed to contain the bearing of the glyph, only the actual pixels. Since QFontEngine did not honor this contract, we would sample the wrong area in the glyph cache to get the glyph image. Task-number: QTBUG-12540 Reviewed-by: Gunnar
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-132-66/+93
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/| | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: When using complex transformations rendering goes easily off by one pixel. Remove compiler warning in qapplication.cpp.
| | | * | When using complex transformations rendering goes easily off by one pixel.Jani Hautakangas2010-09-131-66/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happens because of differences in OpenVG and Qt pixel center point handling. Currently there is no easy generic way to adjust Qt pixels to match OpenVG. This patch adjusts pixels for simple affine transformations by rounding them. Task-number: QT-3791 Reviewed-by: Jason Barron
| | | * | Remove compiler warning in qapplication.cpp.Jason Barron2010-09-131-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Fix a warning since we were deleting the graphics_system instance, but the type was only forward declared. Reviewed-by: Samuel
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1310-10/+74
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: When onDoubleClicked: is handled don't emit a second onPressed/onClicked Add test for view velocity update on setCurrentIndex() Ensure flickable velocity is updated when view is moved by setCurrentIndex
| | | * | When onDoubleClicked: is handled don't emit a second onPressed/onClickedMartin Jones2010-09-134-7/+62
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12250 Reviewed-by: Michael Brasser
| | | * | Add test for view velocity update on setCurrentIndex()Martin Jones2010-09-132-0/+4
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13543
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-1318-71/+473
| | | |\ \
| | | * | | Ensure flickable velocity is updated when view is moved by setCurrentIndexMartin Jones2010-09-134-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13543
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-133-1/+7
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix compilation of QEgl with EGL 1.1 and older.
| | | * | | Fix compilation of QEgl with EGL 1.1 and older.Rhys Weatherley2010-09-123-1/+7
| | | | |/ | | | |/| | | | | | | | | | | Reviewed-by: Sarah Smith
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-132-3/+3
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix slot naming clash
| | | * | Fix slot naming clashMartin Jones2010-09-122-3/+3
| | | |/ | | | | | | | | | | | | Reviewed-by: David Boddie
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-09-1218-71/+473
| | |\ \ | | | |/ | | |/| | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 715b53069911a31a559aa0b3d94ffc6a5ac20988
| | | * Updated WebKit to 715b53069911a31a559aa0b3d94ffc6a5ac20988Simon Hausmann2010-09-1218-71/+473
| | |/ | | | | | | | | | | | | | | | | | | Sync with qtwebkit-2.0 branch * Includes Thiago's intel compiler fixes * Girish' Maemo5 local rendering fixes
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-1110-112/+72
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-114-5/+20
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix crash in QRuntimeGraphicsSystem due to destruction order. Fix crash in OpenVG when failing to allocate large VGImages. Updated 4.7.0 changelog
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-104-5/+20
| | | |\ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix crash in QRuntimeGraphicsSystem due to destruction order. Fix crash in OpenVG when failing to allocate large VGImages. Updated 4.7.0 changelog
| | | * Fix crash in QRuntimeGraphicsSystem due to destruction order.Jason Barron2010-09-102-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Firstly, fix a "leak" by deleting the graphics system when QApplication is destroyed. Secondly, fix a crash when the following scenario occurs: - ~QApplication() deletes the current graphics system (see above) - ~QApplication() calls qt_cleanup() - qt_cleanup() calls QPixmapCache::clear() to delete pixmaps - ~QRuntimePixmapData() tries to remove the pixmap from the runtime graphics system, but it has already been deleted. - *Crash* Reviewed-by: Gunnar Sletta Reviewed-by: Jani Hautakangas
| | | * Fix crash in OpenVG when failing to allocate large VGImages.Jason Barron2010-09-101-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reclaimSpace() function of the VG image pool was crashing when attempting to free up space for a large image. It was calling moveToHeadOfLRU() which adds the image to the pool. If the pixmap is large enough so that it pushes all the others out, then it will be the only pixmap left in the pool when this function returns. This is problematic because this pixmap is not permanent so it could be deleted. If that happens, then subsequent calls to this function will crash because the LRU pixmap has been deleted. The fix is to check if the pixmap was in the pool to begin with and if not, then be sure to remove it before returning from this function. Task-number: QT-3652 Reviewed-by: Jani Hautakangas
| | | * Updated 4.7.0 changelogmread2010-09-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Updated 4.7.0 changelog with Avkon removal compatibility information Reviewed-by: Harald Fernengel
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-106-107/+52
| | |\ \ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Autotests cleanup.
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-106-107/+52
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Autotests cleanup.
| | | | * | Autotests cleanup.Yann Bodson2010-09-106-107/+52
| | | | | |
| * | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-1047-46/+2534
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-1038-9/+2376
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Prevented crash in GL window surface when deleting native child widgets. Fix a regression where setPreferredSize(QSize(100, -1)) did not work. Force MeeGo touch to use native graphics system for now. Fixed compiler warnings in meego graphics system helper. Added meego graphics system helper to features/qt.prf and syncqt. Use QFactoryLoader to ensure we get the correct graphics system plugin. Updated license headers for meego graphics system helper. Fixed compilation and API of meego graphics system helper. Renamed meego graphics system helper files. Imported meego graphics system helper sources. Updated license headers for meego graphics system. Fixed compilation and API of meego graphics system. Renamed meego graphics system files. Imported meego graphics system sources. Fix cache_cost initialization of QFontEngineMultiWin Fix crash when using unprintable chars in QStaticText Don't waste memory on the share widget in the GL window surface.
| | | * | | Prevented crash in GL window surface when deleting native child widgets.Samuel Rødal2010-09-101-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should only destroy the FBO if it's the actual window that's deleted. Reviewed-by: Trond
| | | * | | Fix a regression where setPreferredSize(QSize(100, -1)) did not work.Jan-Arve Sæther2010-09-102-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regressed by change 515991426832a6333f2fd9e639bd4c83e2b27cef Reviewed-by: Frederik Gladhorn
| | | * | | Force MeeGo touch to use native graphics system for now.Samuel Rødal2010-09-101-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MeeGo touch doesn't yet work with other graphics systems since it assumes that QPixmaps are XPixmap based. If MeeGo touch doesn't link against the graphics system helper we'll force it to use the native graphics system.
| | | * | | Fixed compiler warnings in meego graphics system helper.Samuel Rødal2010-09-103-13/+13
| | | | | |
| | | * | | Added meego graphics system helper to features/qt.prf and syncqt.Samuel Rødal2010-09-103-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MeeGo graphics system helper headers are now synced and the correct include path and libraries are added to an application by doing QT += meegographicssystem helper in the .pro file.
| | | * | | Use QFactoryLoader to ensure we get the correct graphics system plugin.Samuel Rødal2010-09-106-26/+55
| | | | | | | | | | | | | | | | | | | | | | | | Also, this prevents hard-coding the path to the meego plugin.
| | | * | | Updated license headers for meego graphics system helper.Samuel Rødal2010-09-1012-84/+408
| | | | | |
| | | * | | Fixed compilation and API of meego graphics system helper.Samuel Rødal2010-09-1014-228/+224
| | | | | |
| | | * | | Renamed meego graphics system helper files.Samuel Rødal2010-09-1013-0/+0
| | | | | |
| | | * | | Imported meego graphics system helper sources.Samuel Rødal2010-09-1013-0/+1001
| | | | | | | | | | | | | | | | | | | | | | | | From http://www.gitorious.com/meego-graphics/meego-graphics
| | | * | | Updated license headers for meego graphics system.Samuel Rødal2010-09-108-56/+272
| | | | | |
| | | * | | Fixed compilation and API of meego graphics system.Samuel Rødal2010-09-1013-148/+158
| | | | | |
| | | * | | Renamed meego graphics system files.Samuel Rødal2010-09-109-0/+0
| | | | | |
| | | * | | Imported meego graphics system sources.Samuel Rødal2010-09-109-0/+738
| | | | | | | | | | | | | | | | | | | | | | | | From http://www.gitorious.com/meego-graphics/meego-graphics
generated by cgit v0.12 at 2024-12-28 12:29:49 (GMT)