summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove EGLImage create/destroy resolving from VG pixmap dataTom Cooksey2010-03-261-6/+1
| | | | | | | eglCreateImageKHR and eglDestroyImageKHR are now defined in qegl.cpp and resolved when the display is opened with QEgl::display(). Reviewed-By: Jason Barron
* Avoid having to create temporary QPixmaps when binding to textureTom Cooksey2010-03-264-13/+10
| | | | Reviewed-By: TrustMe
* Implement Texture-From-Pixmap using EGLImage extensions on X11/EGLTom Cooksey2010-03-266-37/+190
| | | | | | | | | | | | | | | | | | | | | | There's lots of EGLImage extensions, split between EGL and client rendering APIs like OpenGL ES & OpenVG. To implement texture-from- pixmap using EGLImage, both EGL extensions and OpenGL ES extensions are needed. This patch resolves the EGL extension function pointers after the display is initialized in QEgl::display(). These are then exported from QtGui so they can be used in QtOpenGL. The OpenGL ES extension function pointers are resolved using the usual qglextensions.cpp mechanism. Using EGLImage seems to remove a fixed ~10 millisecond overhead per pixmap bind when compared to using EGLSurface. Exact results per bind for 100 QPixmaps are: 8x8 Pixmap: 12 -> 1.71 msecs (EGLSurface -> EGLImage) 64x64 Pixmap: 11.6 -> 1.83 msecs (EGLSurface -> EGLImage) 128x128 Pixmap: 12.8 -> 2.74 msecs (EGLSurface -> EGLImage) 256x256 Pixmap: 16 -> 6.20 msecs (EGLSurface -> EGLImage) Reviewed-By: Trond
* Stabilize tst_QTreeView::taskQTBUG_9216_setSizeAndUniformRowHeightsWrongRepaintGabriel de Dietrich2010-03-261-3/+6
| | | | | | | Non expected paint events and screen size on pulse_qws/linux-x86-g++ seem to be the reason the auto-test fails. Reviewed-by: jeremy
* QMetaObject::normalizeType: Fix parsing of type which contains "const" in namesOlivier Goffart2010-03-263-1/+19
| | | | | | | Regression since b881d8fb99972f1bd04ab4c84843cc8d43ddbeed Task-number: QTBUG-9354 Reviewed-by: Kent Hansen
* QMetaObject::normalizeType: fix uses of const and template.Olivier Goffart2010-03-264-1/+40
| | | | | | | | | | | | | | 'const' was not removed from templated class This even fixes compilation errors if using const return templated types We can change the normalized signature in Qt 4.7 as it has already changed and we have code to check that if moc revision < 5 it will renormalize all the symbols cf commit b881d8fb99972f1bd04ab4c84843cc8d43ddbeed Task-number: QTBUG-7421 Reviewed-by: Brad Reviewed-by: Kent Hansen
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-2629-541/+4385
|\
| * Paintbuffer single frame profiling.Samuel Rødal2010-03-264-25/+400
| | | | | | | | | | | | | | Added new --instrumentframe=X argument which gives a detailed run-down of how many milliseconds each paint command of that frame takes. Reviewed-by: Gunnar Sletta
| * Optimized ARGB32PM on RGB16 blending with opacity using NEON.Samuel Rødal2010-03-261-5/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the blend_8_pixels_argb32_on_rgb16_neon function that was introduced in an earlier commit. Before: traces/qmlsamegame.trace, iterations: 3, frames: 15, min(ms): 63, median(ms): 64, stddev: 1,275776 %, max(fps): 238,095238 After: traces/qmlsamegame.trace, iterations: 3, frames: 15, min(ms): 57, median(ms): 58, stddev: 0,817464 %, max(fps): 263,157895 Task-number: QTBUG-6684 Reviewed-by: Gunnar Sletta
| * Optimized SourceOver and 16 bit dest fetches, dest stores using NEON.Samuel Rødal2010-03-263-15/+134
| | | | | | | | | | | | | | | | This makes for example linear gradient blending on top of RGB16 156 % faster (from 20.4 fps to 52.3 fps in my benchmark). Task-number: QTBUG-6684 Reviewed-by: Gunnar Sletta
| * Optimized scaled/transformed image blending for ARGB32PM and RGB16 on RGB16.Samuel Rødal2010-03-267-419/+890
| | | | | | | | | | | | | | | | | | | | | | | | | | Before: :/traces/qmlphoneconcept.trace, iterations: 5, frames: 48, min(ms): 1207, median(ms): 1212, stddev: 0,165153 %, max(fps): 39,768020 After: traces/qmlphoneconcept.trace, iterations: 3, frames: 48, min(ms): 884, median(ms): 886, stddev: 0,383097 %, max(fps): 54,298643 Task-number: QTBUG-6684 Reviewed-by: Gunnar Sletta
| * Included ARM NEON optimizations from pixman in Qt.Samuel Rødal2010-03-2610-49/+2820
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the N900 16 bit text blending is 30 - 50 % faster, and ARGB32PM on RGB16 image blending now runs in 1/10th of the time it used to. We now make ARGB32PM the default pixmap format for alpha pixmaps instead of ARGB8565PM which is unaligned and bad for performance. The relevant numbers: Mostly opaque pixels: ARGB24 on ARGB24 using QPainter..................: 336,813033 ARGB32 on ARGB32 using QPainter.................: 18,419387 RGB16 on ARGB24 using QPainter..................: 167,301014 RGB16 on ARGB32 using QPainter..................: 17,279372 ARGB24 on RGB16 using QPainter..................: 35,100147 ARGB32PM on RGB16 using QPainter................: 15,924256 No opaque pixels: ARGB24 on ARGB24 using QPainter..................: 412,190765 ARGB32 on ARGB32 using QPainter.................: 16,818389 RGB16 on ARGB24 using QPainter..................: 170,957878 RGB16 on ARGB32 using QPainter..................: 16,742984 ARGB24 on RGB16 using QPainter..................: 93,600482 ARGB32PM on RGB16 using QPainter................: 15,999310 So switching to ARGB32PM should give a boost in all areas. Task-number: QTBUG-6684 Reviewed-by: Gunnar Sletta
| * Safeguard the colortable access when converting corrupted indexed8Gunnar Sletta2010-03-261-2/+2
| | | | | | | | | | Fixes: QTBUG-5510 Reviewed-by: Eskil
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-26309-14542/+14361
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-2625-556/+555
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix bad merge Fix wrong arguments order in a warning in QObject::moveToThread Fix warnings and build on mingw Fixes a deadlock with streaming in Phonon. cetest build fix cetest build fix for TCP sync connection Fixed QPrintPreview text drawing (visible in Assistant). Fix glyph advance on Mac/Carbon itemChange() is now called when transformation properties change. stabilize tst_QTreeView::taskQTBUG_9216_setSizeAndUniformRowHeightsWrongRepaint Fix QLabel::sizeHint() Fix QFontMetrics::height() and QFontMetrics autotest Add QFont::ForceIntegerMetrics style strategy flag Auto test for commit 4a4458d1cf5ec7885c6f63f739b7ee80c70ad211
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-2625-556/+555
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix bad merge Fix wrong arguments order in a warning in QObject::moveToThread Fix warnings and build on mingw Fixes a deadlock with streaming in Phonon. cetest build fix cetest build fix for TCP sync connection Fixed QPrintPreview text drawing (visible in Assistant). Fix glyph advance on Mac/Carbon itemChange() is now called when transformation properties change. stabilize tst_QTreeView::taskQTBUG_9216_setSizeAndUniformRowHeightsWrongRepaint Fix QLabel::sizeHint() Fix QFontMetrics::height() and QFontMetrics autotest Add QFont::ForceIntegerMetrics style strategy flag Auto test for commit 4a4458d1cf5ec7885c6f63f739b7ee80c70ad211
| | * | \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-268-38/+95
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Don't specify a BottomToTop scan line direction for YUV frames. Support expanding aspect ratio in direct show video window control. Support the Expanding aspect ratio mode in the gstreamer window control.
| | | * | Don't specify a BottomToTop scan line direction for YUV frames.Andrew den Exter2010-03-261-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A positive image height is supposed to indicate BottomToTop scan line direction, but this would seem to be true for RGB formats. Reviewed-by: Dmytro Poplavskiy
| | | * | Support expanding aspect ratio in direct show video window control.Andrew den Exter2010-03-264-30/+43
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9118 Reviewed-by: Dmytro Poplavskiy
| | | * | Support the Expanding aspect ratio mode in the gstreamer window control.Andrew den Exter2010-03-263-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy Task-number: QTBUG-9118
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-263-7/+29
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: specify the configuration's purpose based on security mode of network.
| | | * | | specify the configuration's purpose based on security mode of network.Lorn Potter2010-03-263-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | open is public.
| * | | | | Fix QItemDelegate::textRectangleEskil Abrahamsen Blomfeldt2010-03-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The textRectangle should contain all pixels in the text, including those which are only partially covered, so the width and height should never be rounded down. Adding support for fractional font metrics on Mac made this bug visible. Fixes test failure in itemdelegate autotest. Reviewed-by: Olivier
* | | | | | Synchronize rich text and plain text code paths in QStaticTextEskil Abrahamsen Blomfeldt2010-03-262-2/+40
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drawing a string as plain text and rich text should have identical results unless special formatting information is added in the html. This means we should not have any implicit margin on the QTextDocument used to paint the text, and we should make up for the fact that the drawStaticText() call currently takes the position of the baseline and QTextDocument::drawContents() takes the top-left corner. Reviewed-by: Gunnar
* | | | | Fix bad mergeOlivier Goffart2010-03-251-15/+7
| | | | |
* | | | | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-25284-13975/+13795
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/generator.cpp tools/qdoc3/node.cpp
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-25284-13972/+13784
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (153 commits) Use QTRY_COMPARE after QTest::qWaitForWindowShown() Use the new memory cost reporting API in QtScript Custom Class example QtScript: Add API for reporting additional memory costs Add experimental support for StaticContents in Mac OS X. Fix misspelling in function name. don't just return the first key here. Fix CI sytem build breakage. Fix crash. Compile with QT_NO_NETWORKINTERFACE defined. Don't emit signals in constructor. Remove unused code. fix multiple promps for keychain access when connecting to wifi network not all interfaces should be active Update changelog Fix qcombobox:flaggedItems autotest failure. Wrong value for PM_ScrollBarExtent on Windows XP. doc: Fixed all the remaining qdoc errors. For now. Do not move keyboard focus to invisible windows on X11. Do not use _NET_ACTIVE_WINDOW for nonmanaged windows. Revert "Revert "Make QWidget::activateWindow() NET window manager aware."" ...
| | * | Use QTRY_COMPARE after QTest::qWaitForWindowShown()Kent Hansen2010-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | Apparently it's possible that the window has been shown but haven't received a paint event yet.
| | * | Use the new memory cost reporting API in QtScript Custom Class exampleKent Hansen2010-03-253-2/+30
| | | | | | | | | | | | | | | | Also describe its purpose in the example doc.
| | * | QtScript: Add API for reporting additional memory costsKent Hansen2010-03-255-3/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QScriptEngine::reportAdditionalMemoryCost(int). This function provides the ability to give a hint to the engine that it should perhaps trigger garbage collection sooner rather than later. For example, if you've implemented a JS ByteArray class that wraps a QByteArray, and a user constructs a few hundred temporary ByteArray objects of large sizes, failure to report the additional memory cost may cause the application's memory consumption to grow and grow (because the script engine thinks they are "cheap" objects, the GC won't kick in). Reporting the correct size can be difficult (or impossible) in some cases. For example, it's difficult to predict the total amount of system memory & resources consumed by a QImage. But even reporting a heuristic / approximate cost can be better than reporting no cost. Task-number: QTBUG-6238 Reviewed-by: Simon Hausmann
| | * | Add experimental support for StaticContents in Mac OS X.Fabien Freling2010-03-251-1/+18
| | | | | | | | | | | | | | | | Reviewed-by: Morten Sorvig
| | * | Fix misspelling in function name.Fabien Freling2010-03-251-2/+2
| | | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-03-25226-3447/+2531
| | |\ \
| | | * \ Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-25226-3447/+2531
| | | |\ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.cpp src/declarative/qml/qdeclarativecompiler.cpp
| | * | | don't just return the first key here.Lorn Potter2010-03-251-3/+0
| | |/ / | | | | | | | | | | | | this fixes associating..
| | * | Fix CI sytem build breakage.Morten Johan Sørvig2010-03-251-0/+0
| | | | | | | | | | | | | | | | (The .pro file name must match the dir name)
| | * | Fix crash.Aaron McCarthy2010-03-251-1/+1
| | | | | | | | | | | | | | | | Resources are not allocated on error. Only free on success.
| | * | Compile with QT_NO_NETWORKINTERFACE defined.Aaron McCarthy2010-03-2520-24/+67
| | | |
| | * | Don't emit signals in constructor.Aaron McCarthy2010-03-252-4/+11
| | | |
| | * | Remove unused code.Aaron McCarthy2010-03-252-212/+113
| | | |
| | * | fix multiple promps for keychain access when connecting to wifi networkLorn Potter2010-03-252-39/+111
| | | | | | | | | | | | | | | | Task-number: QT-3150
| | * | not all interfaces should be activeLorn Potter2010-03-251-2/+2
| | | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-03-24146-1017/+4133
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/bearer/corewlan/qcorewlanengine.mm
| | | * | Update changelogThiago Macieira2010-03-241-0/+10
| | | | |
| | | * | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-2414-38/+43
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Four-way merge: take the qt-qml.git#4.7 branch version (which uses fromUtf8). I used QLatin1String, Thierry used QString::fromLatin1. Conflicts: src/declarative/qml/qdeclarativecompiler.cpp
| | | * | | Fix qcombobox:flaggedItems autotest failure.Thiago Macieira2010-03-242-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QElapsedTimer doesn't initialise itself on construction, which means we were actually depending on uninitialised data. QTime does initialise itself to NullTime. This means the test didn't actually work if you ran it precisely at midnight... Reviewed-By: Trust Me
| | | * | | Wrong value for PM_ScrollBarExtent on Windows XP.Prasanth Ullattil2010-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NONCLIENTMETRICSW::iPaddedBorderWidth member is supported only on Windows Vista and above. So when calling the SystemParametersInfo for SPI_GETNONCLIENTMETRICS on Windows XP, the size for that member needs to be removed from NONCLIENTMETRICSW::cbSize. Task-number: QTBUG-8639 Reviewed-by: Thierry
| | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-2416-213/+435
| | | |\ \ \
| | | | * | | Do not move keyboard focus to invisible windows on X11.Denis Dzyubenko2010-03-242-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QWidget::activateWindow() is called we check if the window was already mapped and just do not do anything if it wasn't. We used to try to active it by giving it keyboard focus, but that always fails because it isn't allowed to call XSetInputFocus on invisible windows, and the error message was swalled by Qt in the error handler. So now we just don't bother even trying if we know the call will fail. Task-number: QTBUG-4042 Reviewed-by: Benjamin Poulain Reviewed-by: Bradley T. Hughes
| | | | * | | Do not use _NET_ACTIVE_WINDOW for nonmanaged windows.Denis Dzyubenko2010-03-242-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a window has X11BypassWindowManager hint, we shouldn't bother asking the windowmanager to active it using the _NET_ACTIVE_WINDOW protocol and just go though Xorg directly. Reviewed-by: Bradley T. Hughes
generated by cgit v0.12 at 2024-11-08 03:37:39 (GMT)