summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Make QGLShaderProgram-dependency in QtMultimedia explicit in src.proTor Arne Vestbø2010-03-151-1/+1
| | | | | | QtOpenGL needs to be built before QtMultimedia to avoid link errors. Reviewed-by: Gunnar
* Gstreamer player: allow video output changes during video playback.Dmytro Poplavskiy2010-03-152-18/+186
| | | | Reviewed-by: Andrew den Exter
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-153-3/+3
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Install plugins to correct path.
| * Install plugins to correct path.Justin McPherson2010-03-153-3/+3
| | | | | | | | | | Task-number: QTBUG-9001 Reviewed-by: Kurt Korbatits
* | Fix compilation of OpenVG paint engine with OpenVG 1.0Rhys Weatherley2010-03-141-0/+9
| | | | | | | | Task-number: QTBUG-9006
* | Removed a Valgrind warning.Trond Kjernåsen2010-03-121-1/+2
| | | | | | | | Reviewed-by: Gunnar
* | Made QGLExtensions::glExtensions() thread-safe.Trond Kjernåsen2010-03-122-21/+18
| | | | | | | | Reviewed-by: Gunnar
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-1213-90/+99
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QTreeView: Optimise QTreeViewPrivate::viewIndex Optimize QSortFilterProxyModel QTreeView: speedup more QTreeViewPrivate::layout(-1) Remove debug output from qt_eglproperties_set_glformat Delete the QGLContext in ~QX11GLPixmapData Made QGLTextureCache::instance() threadsafe. Add support for QFont::NoAntialias on QWS Fix 1-bit to 8-bit conversion for bitmap fonts on QWS
| * QTreeView: Optimise QTreeViewPrivate::viewIndexOlivier Goffart2010-03-111-35/+27
| | | | | | | | | | | | | | | | | | | | ... by first looking around the last find item. This was already done, but only for the 4 closest item. Now start searching from the last index and continue. Reviewed-by: Gabriel Task-number: QTBUG-8886
| * Optimize QSortFilterProxyModelOlivier Goffart2010-03-111-7/+9
| | | | | | | | | | | | | | - use QHash instead of QMap - use QVector::reserve when the size is known Reviewed-by: Gabriel
| * QTreeView: speedup more QTreeViewPrivate::layout(-1)Olivier Goffart2010-03-112-16/+27
| | | | | | | | | | | | Specially when called from expandAll Reviewed-by: Gabriel
| * Remove debug output from qt_eglproperties_set_glformatTom Cooksey2010-03-111-3/+1
| | | | | | | | Reviewed-By: TrustMe
| * Delete the QGLContext in ~QX11GLPixmapDataTom Cooksey2010-03-118-3/+12
| | | | | | | | | | | | | | | | This also includes changes which allow QGLContext to not own it's own QEglContext. With X11GL, the QEglContext gets reused by multiple QGLContexts so it is important QGLContext doesn't delete it. Reviewed-By: TrustMe
| * Made QGLTextureCache::instance() threadsafe.Trond Kjernåsen2010-03-112-21/+7
| | | | | | | | Reviewed-by: Tom Cooksey
| * Add support for QFont::NoAntialias on QWSPaul Olav Tvete2010-03-111-3/+4
| | | | | | | | | | Task-number: QTBUG-5936 Reviewed-by: Eskil
| * Fix 1-bit to 8-bit conversion for bitmap fonts on QWSPaul Olav Tvete2010-03-111-2/+12
| | | | | | | | | | | | | | | | | | QImage doesn't know that we are abusing Format_Indexed8 as an alpha map. The proper solution is to add new image formats. This is just a quick fix. Task-number: QTBUG-5936 Reviewed-by: Jeremy
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-123-24/+43
|\ \ | |/ |/| | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QPainterVideoSurface: assume yuv 420p and YV12 lines are 4 byte aligned. Delayed initialization of gstreamer video widget.
| * QPainterVideoSurface: assume yuv 420p and YV12 lines are 4 byte aligned.Dmytro Poplavskiy2010-03-121-4/+10
| | | | | | | | Reviewed-by: Andrew den Exter
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-126-14/+727
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-1047-404/+775
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-09171-3379/+2971
| |\ \ \
| * | | | Delayed initialization of gstreamer video widget.Dmytro Poplavskiy2010-03-082-20/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves time/memory when the video widget control is not used, and allows using of audio only QMediaPlayer in non gui applications. Reviewed-by: Justin McPherson
* | | | | Fixed problem displaying half width character as full widthDaisuke Kameda2010-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is the problem that Qt displays half width character (e.g. alphabet) as full width. This is reported in #QTBUG-1726. This occurs in the following fonts. - Monospace font - Selif font - IPA font (Ver.0301) - NSimSun In Cario and fontconfig, the FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH is specified as flag of FT_Load_Glyph function to solve this problem. According to the document of freetype, this flag exists to support buggy CJK fonts. So this flag is specified as default flag of QFontEngineFT. Merge-request: 2319 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* | | | | make it possible to use sse2 with mingwThierry Bastian2010-03-1117-28/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All the windows callback functions need an attribute to force the alignment of the arg pointer. Reviewed-by: Benjamin Poulain
* | | | | QTreeView: Optimize by avoiding calling detachOlivier Goffart2010-03-111-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QVector::operator[] calls detach. and we should avoid calling it in a loop. QVector::at() cannot be used here because we need a non const reference. Reviewed-by: Gabriel
* | | | | Cleaning commit 7baaea978200c82fdf65e3934cfa373edeca6524Gabriel de Dietrich2010-03-111-1/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust me
* | | | | Fixed rounded SVG rectangles when 'rx' or 'ry' is 0.Kim Motoyoshi Kalland2010-03-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8264 Reviewed-by: Trond
* | | | | Slow QTreeView::layout() with many (> 10000) childrenGabriel de Dietrich2010-03-102-15/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When updating the QTreeViewItem::total field in layout(), we used to call QTreeViewPrivate::viewIndex() to get the parent item, which is O(n). We have now introduced 'parentItem' in QTreeViewItem wich makes this O(1), with a small penality when inserting and removing elements in QTreeViewPrivate::viewItems. The QTreeViewPrivate::checkViewItems() is left inside the code for further debugging. Reviewed-by: Olivier Task-number: QTBUG-8885
* | | | | Fixed "inconsistent dll linkage" warning on Windows.Kim Motoyoshi Kalland2010-03-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt_memrotate90() was declared twice, once with and once without Q_GUI_EXPORT. Reviewed-by: Trond
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-1015-85/+165
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Re-enable tst_QGL::glWidgetRenderPixmap on X11/EGL Added clipping to the dashed stroke processor in the GL2 engine. Fixed assert failure when drawing dashes with raster engine. Update tst_QGL::getSetCheck to check for new (correct) behaviour Update QGLFormat from EGLConfig properly Make calls to QGLFormat::set*BufferSize also update flags Compile fix when Qt3Support is enabled for devices using EGL. Cocoa: Fix misaligned text between format changes Added configure check to diasable building QtDeclarative Fixes Q3ListViewItem grandchildren not sorted if item has one child Compile with Qt3Support in a ScratchBox environment.
| * | | | | Added clipping to the dashed stroke processor in the GL2 engine.Kim Motoyoshi Kalland2010-03-104-30/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without clipping, the stroker could consume a huge amount of memory when scaling up cosmetic, dashed strokes. I also made QDashStroker clip more aggressively. Task-number: QTBUG-7832 Reviewed-by: Samuel
| * | | | | Fixed assert failure when drawing dashes with raster engine.Kim Motoyoshi Kalland2010-03-101-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Samuel
| * | | | | Update QGLFormat from EGLConfig properlyTom Cooksey2010-03-106-45/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, some members of QGLFormat (like alphaBufferSize) would be left to the initial -1 value. Reviewed-By: TrustMe
| * | | | | Make calls to QGLFormat::set*BufferSize also update flagsTom Cooksey2010-03-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Trond
| * | | | | Compile fix when Qt3Support is enabled for devices using EGL.Trond Kjernåsen2010-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Samuel
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-10371-7291/+18758
| |\ \ \ \ \
| | * | | | | Fixes Q3ListViewItem grandchildren not sorted if item has one childAlexader Karaivanov2010-03-101-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Q3ListViewItem::sortChildItems() used to exits early if there is only 1 child item and leaves grandchildren unsorted. Merge-request: 2260 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| | * | | | | Compile with Qt3Support in a ScratchBox environment.Trond Kjernåsen2010-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Tom Cooksey
| * | | | | | Cocoa: Fix misaligned text between format changesEskil Abrahamsen Blomfeldt2010-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts part of commit e008504b5ec34975e34adf3b1a2b7170d0e4dd38. The original commit aimed to round up all fractional numbers for the font to "improve appearance". Rounding up the last advance of a set of advances in a glyph layout, however, breaks text layout completely, since the layout of text will be different depending on how many text lines is used to represent it (since the last glyph in each line will have a higher advance than the others.) This was e.g. visible in Qt Creator when turning on whitespace visualization, as all spaces then created a format change, thus a new text line in the text layout, and hence an increase of X pixels in the positioning of the text after the space, where 0.0 < X < 1.0. I see no negative results of removing the rounding, but if there are any problems, it has to be fixed in the usage of the advances not in the advances themselves. Task-number: QTCREATORBUG-381, QTBUG-8791 Reviewed-by: mae
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-102-0/+120
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Update def files for latest QtDeclarative API
| * | | | | | Update def files for latest QtDeclarative APIShane Kearns2010-03-102-0/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QDeclarativeBinding API is new since last week's freeze. Froze the def files again, so that applications that use this API will be able to link. Task-number: QTBUG-8909 Reviewed-by: Trust Me
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-109-50/+97
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: MAke the SIMD fiunctions be used even when the QT_NO_DEBUG macro is used Make sure 16-bit EGL configs are chosen over 32-bit configs Make the EGL contexts in QX11GLPixmapData Q_GLOBAL_STATIC Handle EGLSurfaces better, including more error detection Make sure pixmap hooks get installed so EGL surfaces are cleaned up Don't show resize cursor for fixed-size windows
| * | | | | | | MAke the SIMD fiunctions be used even when the QT_NO_DEBUG macro is usedThierry Bastian2010-03-101-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Benjamin Poulain
| * | | | | | | Make sure 16-bit EGL configs are chosen over 32-bit configsTom Cooksey2010-03-102-32/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to make sure 16-bit configs are chosen over 32-bit configs as they will provide the best performance. The EGL config selection algorithm is a bit stange in this regard: The selection criteria for EGL_BUFFER_SIZE is "AtLeast", so we can't use it to discard 32-bit configs completely from the selection. So it then comes to the sorting algorithm. The red/green/blue sizes have a sort priority of 3, so they are sorted by first. The sort order is special and described as "by larger _total_ number of color bits.". So EGL will put 32-bit configs in the list before the 16-bit configs. However, the spec also goes on to say "If the requested number of bits in attrib_list for a particular component is 0, then the number of bits for that component is not considered". This part of the spec also seems to imply that setting the red/green/blue bits to zero means none of the components are considered and EGL disregards the entire sorting rule. It then looks to the next highest priority rule, which is EGL_BUFFER_SIZE. Despite the selection criteria being "AtLeast" for EGL_BUFFER_SIZE, it's sort order is "smaller" meaning 16-bit configs are put in the list before 32-bit configs. So, to make sure 16-bit is preffered over 32-bit, we must set the red/green/blue sizes to zero. This has an unfortunate consequence that if the application sets the red/green/blue size to 5/6/5 on the QGLFormat, they will probably get a 32-bit config, even when there's an RGB565 config avaliable. Oh well. Reviewed-By: TrustMe
| * | | | | | | Make the EGL contexts in QX11GLPixmapData Q_GLOBAL_STATICTom Cooksey2010-03-101-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still not ideal, but this should do for now. Reviewed-By: TrustMe
| * | | | | | | Handle EGLSurfaces better, including more error detectionTom Cooksey2010-03-106-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: This changes QX11PixmapData::gl_surface to a void* to enable build on 64-bit systems where EGLSurface is a pointer. Reviewed-By: TrustMe
| * | | | | | | Make sure pixmap hooks get installed so EGL surfaces are cleaned upTom Cooksey2010-03-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| * | | | | | | Don't show resize cursor for fixed-size windowsPaul Olav Tvete2010-03-101-2/+4
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8144 Reviewed-by: Jørgen Lind
* | | | | | | Merge branch '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-1072-2768/+3233
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (83 commits) Don't wait forever when scanning for wifi networks on win32 fails. Revert 12b6987031be9faee3886d7623888feb4e1762af Changed TEST_COMPILER from CC to CXX in configure script. doc: Fixed several qdoc errors. Carbon: Native filedialog does not apply filters on app-bundles Cocoa: Native filedialog does not apply filters on app-bundles Improve performance of QTimer::singleShot Add a benchmark comparing single shot timer with invokeMethod use Qt's private mac functions, reduce code redundancy Assistant: Fix compile warning for empty header. Doc: mark QEasingCurve support functions as new in 4.7. Modify the XML test suite not to use non-characters. Autotest: Fix failing QTextCodec tests Doc: mark methods as internal (as they were in previous releases) Doc: add image for Qt Quick to "What's New" page. qdoc: Clear a static multimap after each qdocconf file. qdoc: Added some debug output to track down a crash Fixed mouse wheel handling in scrollareas. Added two missing keys for X11 Carbon: usage of menu bars can cause exceptions to be thrown ...
| * | | | | | Don't wait forever when scanning for wifi networks on win32 fails.Aaron McCarthy2010-03-101-3/+20
| | | | | | |
generated by cgit v0.12 at 2025-02-08 17:07:18 (GMT)