summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Moved UID2 processing from cpp code to profiles.axis2010-03-152-17/+16
| | | | | | This enables it to be used by all Symbian build systems. RevBy: Miikka Heikkinen
* Merge branch 'master' of ↵axis2010-03-15110-1426/+2720
|\ | | | | | | scm.dev.nokia.troll.no:qt/kamlies-qt-s60-linux-mkspec into 4.7-s60
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-1554-298/+587
| |\ | |/ |/|
* | 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
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-141-0/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix compilation of OpenVG paint engine with OpenVG 1.0
| * | | Fix compilation of OpenVG paint engine with OpenVG 1.0Rhys Weatherley2010-03-141-0/+9
| | | | | | | | | | | | | | | | Task-number: QTBUG-9006
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-1214-112/+119
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Removed a Valgrind warning. Made QGLExtensions::glExtensions() thread-safe. 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
| * | 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-129-18/+1032
| |\ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-1068-454/+2227
| |\ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-09346-6306/+9630
| |\ \ \ \ \
| * | | | | | 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
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-1119-34/+44
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed problem displaying half width character as full width make it possible to use sse2 with mingw QTreeView: Optimize by avoiding calling detach Cleaning commit 7baaea978200c82fdf65e3934cfa373edeca6524
| * | | | | | 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
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-111-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed rounded SVG rectangles when 'rx' or 'ry' is 0.
| * | | | | | Fixed rounded SVG rectangles when 'rx' or 'ry' is 0.Kim Motoyoshi Kalland2010-03-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8264 Reviewed-by: Trond
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-103-16/+53
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Slow QTreeView::layout() with many (> 10000) children Fixed "inconsistent dll linkage" warning on Windows.
| * | | | | | 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-1018-113/+320
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Re-enable tst_QGL::glWidgetRenderPixmap on X11/EGLTom Cooksey2010-03-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGLWidget::renderPixmap now works under X11/EGL. Tested on both Fremantle and Harmattan. Reviewed-By: TrustMe
| * | | | | | 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 tst_QGL::getSetCheck to check for new (correct) behaviourTom Cooksey2010-03-101-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Trond
| * | | | | | 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-10960-22372/+43328
| |\ \ \ \ \ \
| | * | | | | | Added configure check to diasable building QtDeclarativeJørgen Lind2010-03-101-19/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when Qt is not building the QtScript module
| | * | | | | | Fixes Q3ListViewItem grandchildren not sorted if item has one childAlexader Karaivanov2010-03-102-2/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | * Added rpp and rsg files to ignore filter.axis2010-03-111-0/+2
| | | | | | | |
| | | | | | | * Moved two profiles to the correct directory.axis2010-03-112-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gets applications building again.
generated by cgit v0.12 at 2024-11-12 08:50:23 (GMT)