summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-0613-30/+73
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (42 commits) QBoxLayout::setGeometry would not respect the widget min/max width Revert "QStyleSheetStyle: Fixed some text croped when having padding with native border." Use QFile:rename when moving items in QFileystemModel. Revert "Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram" Fix default filter selection when using HideNameFilterDetails option. Don't write out fo:word-spacing if its the default value. Improved initial startup time for a QGLWidget ontop of EGL/X11. Document the QGraphicsView::IndirectPainting flag Display broken symlinks in the filesystem model. Fix typo in autotest testcase name. Fixed a bug with distribution of spans. Make unit test more robust Compile with QT_NO_DOCKWIDGET Removed temporary QGLWidget created during QGLWidget/X11 initialization. Fix test: The bug is now fixed Fix auto-test failure on Windows QScript: Lookup the native setter from the prototype Implement QScript::QObjectDelegate::getOwnPropertyDescriptor fix compilation in GL2 paint engine for Windows Move QGLTextureGlyphCache into it's own file ...
| * QBoxLayout::setGeometry would not respect the widget min/max widthGabriel de Dietrich2010-01-061-2/+4
| | | | | | | | | | | | | | | | | | | | When calling heightforWidth after a geometry change, the width actually used could be outside the widget's width bounds. The height could then be smaller than needed to fit the widget's contents resulting in a clipped widget being drawn. Auto-test included. Reviewed-by: Olivier Task-number: QTBUG-7103
| * Revert "QStyleSheetStyle: Fixed some text croped when having padding with ↵Olivier Goffart2010-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | native border." This reverts commit 6e90192b599cee9b903177a0978198326f667613. his change the behaviour a little bit. It is better to wait for Qt 4.7 Reviewed-by: jbache
| * Use QFile:rename when moving items in QFileystemModel.Alexis Menard2010-01-061-2/+1
| | | | | | | | | | | | | | | | | | | | We got for free the recursive move if the directory that we move has subdirectories. Unfortunately copying a directory to an another is not easy in Qt so the copy still doesn't work if the directory contains directories. Task-number:QTBUG-5855 Reviewed-by:ogoffart
| * Fix default filter selection when using HideNameFilterDetails option.Alexis Menard2010-01-061-15/+28
| | | | | | | | | | | | | | | | | | | | When you have HideNameFilterDetails on, comparing the default filter given in parameter for selectNameFilter has to be done with the striped version of the filter, i.e. without the details. Task-number:QTBUG-4842 Reviewed-by:gabriel Reviewed-by:olivier
| * Don't write out fo:word-spacing if its the default value.Thomas Zander2010-01-061-2/+2
| | | | | | | | | | | | | | | | | | the property fo:word-spacing is still not in an official ODF spec so a strict schema check will fail in any doc that uses it. Lets make sure we limit the writing of that property to only those usecases where the property was really set by the user. Task-number: QTBUG-5725
| * Document the QGraphicsView::IndirectPainting flagOlivier Goffart2010-01-062-1/+11
| | | | | | | | | | | | And that the QGraphics{View,Scene}::drawItems function are now obsolete. Reviewed-by: Alexis
| * Display broken symlinks in the filesystem model.Alexis Menard2010-01-051-1/+1
| | | | | | | | | | | | | | A broken symlink has a -1 size so we need to special case that. Task-number:QTBUG-7119 Reviewed-by:olivier
| * Merge branch 'QT-2261' into 4.6Jan-Arve Sæther2010-01-051-2/+2
| |\
| | * Fixed a bug with distribution of spans.Jan-Arve Sæther2010-01-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a span required more size than the rows/columns it spanned, the size of the span was not distributed to the rows it spanned. The result was that the size hints of the layout was not correct, causing the layout to be potentially smaller than the spanning item. Task: QT-2261 Reviewed-by: Alexis
| * | Compile with QT_NO_DOCKWIDGETOlivier Goffart2010-01-051-0/+2
| | | | | | | | | | | | Task-number: QTBUG-7133
| * | Make the ShowDirsOnly option work in QFileDialog.Alexis Menard2010-01-041-0/+3
| | | | | | | | | | | | | | | | | | | | | This option was simply not implemented at all so it didn't work. Task-number:QTBUG-6558 Reviewed-by:ogoffart
| * | Slight performance improvement in comp_func_SourceOver.Samuel Rødal2010-01-041-1/+4
| | | | | | | | | | | | | | | | | | | | | We should check for the fully opaque and fully transparent special cases, like we do in the dedicated image blend functions. Reveiewed-by: Gunnar Sletta
| * | fixed typo in qpainter docsGunnar Sletta2010-01-041-1/+1
| | |
| * | Make stretchblit an opt-out option in DirectFBAnders Bakken2010-01-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Certain boards are not support StretchBlit very well. This patch enables them to define QT_NO_DIRECTFB_STRETCHBLIT to fall back to the raster engine for stretchblits. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | Set serial number in QX11PixmapData::transformedAnders Bakken2010-01-041-0/+2
| | | | | | | | | | | | | | | | | | | | | QX11PixmapData::transformed initializes a new QX11PixmapData object but doesn't set its serial number. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | Fix background brush for character format when writing to ODF document.Pierre Rossi2009-12-301-1/+8
| | | | | | | | | | | | | | | Task-number: QTBUG-7047 Reviewed-by: Benjamin Poulain
| * | Fixes painting artifacts when using CacheBackground in a QGraphicsView.Yoann Lopes2009-12-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that when the background cache was invalidated, it was entirely recreated but only the exposed area of the view was repainted in it, causing the cache to be partly empty in some cases. Now the background cache is always fully repainted when it is invalidated. Task-number: QTBUG-6935 Reviewed-by: ogoffart
* | | Fix QT_NO_CONTEXTMENUKent Hansen2010-01-061-0/+2
| | | | | | | | | | | | Task-number: QTBUG-6474
* | | doc: Clarified that the scene owns its items and destroys them.Martin Smith2010-01-061-11/+17
| | | | | | | | | | | | Task-number: QTBUG-6637
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-062-1/+3
|\ \ \
| * | | Prevent a crash when creating an inputContext from the QApplication dtor.Denis Dzyubenko2010-01-052-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When accessing the global input context from the QWidget destructor access it directly instead of calling a helper function. Don't even bother to create an input context if QApplication is being destroyed (just in case if the user is calling the QApplication::inputContext manually from the destructor). Task-number: QTBUG-7105 Reviewed-by: Simon Hausmann
* | | | doc: Fixed references to currsor position().Martin Smith2010-01-061-26/+29
|/ / / | | | | | | | | | Task-number: QTBUG-6763
* | | doc: Added note explaining grabMouse() for Cocoa and Carbon.Martin Smith2010-01-051-4/+10
| | | | | | | | | | | | Task-number: QTBUG-6810
* | | doc: Clarified which values were added in Qt 4.4.Martin Smith2010-01-051-8/+11
| | | | | | | | | | | | Task-number: QTBUG-7118
* | | doc: Clarified next and previous activation order.Martin Smith2010-01-051-8/+8
| | | | | | | | | | | | Task-number: QTBUG-6992
* | | Cocoa: added release poolRichard Moe Gustavsen2010-01-041-0/+1
| | | | | | | | | | | | | | | Fix warning given by cocoa (cherry picked from commit 875afab977005b03d307040fb3be15c7524a37ff)
* | | Mac: qcolordialog autotest fails.Richard Moe Gustavsen2010-01-041-0/+1
| | | | | | | | | | | | | | | | | | | | | I removed a line as an optimization a while ago. Luckily, the autotest cought a failure doing so. So we put the line back in. Reviewed-by: Prasanth
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-0428-186/+624
|\ \ \ | |/ /
| * | Fixes crash when widget with WA_StaticContents child become toplevel.Olivier Goffart2009-12-291-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Happens for example if a DockWidget is undocked and has a child whith the WA_StaticContents attribute. The parent does not change (so newParent is false) but still, the top level widget change. So staticWidget need to be moved to the new backingstore. Reviewed-by: Benjamin Poulain Task-number: QTBUG-6883
| * | Fixed a copy-paste error in QRasterPixmapData::metric().Trond Kjernåsen2009-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Calling metric() to get the device height in mm of a pixmap when using the raster engine would actually return the width.. Task-number: QTBUG-6985 Reviewed-by: Carlos Duclos
| * | QStyleSheetStyle: Fixed some text croped when having padding with native border.Olivier Goffart2009-12-281-1/+1
| | | | | | | | | | | | | | | | | | | | | The native border width need to be taken into account in QRenderRule::boxRect() Task-number: QTBUG-6855 Reviewed-by: Benjamin Poulain
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-272-19/+28
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845 Read QWS_SIZE from layer rather than screen Get rid of no_cast_from_ascii warning Docs: Amendments to latest changes to QImageReader docs. images: Document QImageReader::loopCount behaviour for infinite loops gif: Add unit test for QImageReader::size calls gif: 10% speedup on microbenchmark on QImageReader png: Avoid calling QImage::scanLine(int) from within a loop QImageReader: Avoid errorString creation in the normal case Fix text rendering on GL2 paint engine
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-262-19/+28
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845 Read QWS_SIZE from layer rather than screen Get rid of no_cast_from_ascii warning Docs: Amendments to latest changes to QImageReader docs. images: Document QImageReader::loopCount behaviour for infinite loops gif: Add unit test for QImageReader::size calls gif: 10% speedup on microbenchmark on QImageReader png: Avoid calling QImage::scanLine(int) from within a loop QImageReader: Avoid errorString creation in the normal case Fix text rendering on GL2 paint engine
| | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-252-19/+28
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845 Read QWS_SIZE from layer rather than screen Get rid of no_cast_from_ascii warning Docs: Amendments to latest changes to QImageReader docs. images: Document QImageReader::loopCount behaviour for infinite loops gif: Add unit test for QImageReader::size calls gif: 10% speedup on microbenchmark on QImageReader png: Avoid calling QImage::scanLine(int) from within a loop QImageReader: Avoid errorString creation in the normal case Fix text rendering on GL2 paint engine
| | | | * | Docs: Amendments to latest changes to QImageReader docs.Andreas Aardal Hanssen2009-12-231-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Holger Hans Peter Freyther <zecke@selfish.org>
| | | | * | images: Document QImageReader::loopCount behaviour for infinite loopsHolger Hans Peter Freyther2009-12-231-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The gif and mng reader will return -1 as QImageReader::loopCount() for infinite images. Document that this -1 is clashing with the error handling of this method. The documentation was mixing the default and error cases. In some cases "Otherwise -1" and "Otherwise 0" was used. Change this to mention the default coming from QImageIOHandler in the "Otherwise" clause and document the error case with -1. Add a test case to check that loopCount() returns -1 for infinite animations. Reviewed-by: Andreas
| | | | * | png: Avoid calling QImage::scanLine(int) from within a loopHolger Hans Peter Freyther2009-12-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Andreas
| | | | * | QImageReader: Avoid errorString creation in the normal caseHolger Hans Peter Freyther2009-12-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deploy the same idiom found in QIODevice::errorString(). Return "Unknown Error" in case of am empty string. This is a tiny improvement for QtWebKit. Reviewed-by: Andreas
| * | | | | Merge branch '4.5' into 4.6-stagingThiago Macieira2009-12-261-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | Conflicts: tests/benchmarks/benchmarks.pro
| | * | | | Use Mono instead of MonoLSB when writing pbm files.Rhys Weatherley2009-12-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PBM files are MSB, not LSB - the pbm reader was correct, but not the pbm writer. Task-number: QTBUG-6937 Reviewed-by: Sarah Smith
| * | | | | Don't include dlfcn.h unconditionally.Thiago Macieira2009-12-251-0/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Task-number: QTBUG-3344 Reviewed-by: Trust Me
| * | | | Minor optimization for QS60StyleSami Merila2009-12-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ask selected state only once in QS60Style when handling element CE_TabBarTabLabel. Reviewed-by: TrustMe
| * | | | Correcting white space in QS60StyleSami Merila2009-12-231-76/+76
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | QComboboxes are squeezed in QVGA screensSami Merila2009-12-231-29/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ComboBoxes and SpinBoxes are squeezed in QVGA screens, due to dodgy style calculations. This fix ensures that sub-widget buttons for these widgets are always square. Task-number: QT-2158 (internal) Reviewed-by: axis
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2009-12-232-6/+19
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Setting background color to a QDialog doesn't work QWidget with the window flag Qt::Dialog is not decorated as a dialog Device flickers badly when orientation change occurs Changed make sis only require .make.cache if QT_SIS_TARGET is not set.
| | * | | Setting background color to a QDialog doesn't workSami Merila2009-12-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since dialogs use their own theme graphics for background, regular method of checking the palette fails (as generic background brush is probably unchanged). Therefore to check if the dialog background is using default (=theme graphic), it needs to check the cache key value of background - so that it matches with the one in stored theme palette. Task-number: QTBUG-5898 Reviewed-by: Janne Koskinen
| | * | | QWidget with the window flag Qt::Dialog is not decorated as a dialogSami Merila2009-12-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously style casted widgets to QDialog to see if it is able to draw dialog background theme graphic. As a fix, we now query window flag from the widget and if it is equivalent of Qt::Dialog, draw dialog background. Task-number: QTBUG-5930 Reviewed-by: Janne Koskinen
| | * | | Device flickers badly when orientation change occursSami Merila2009-12-232-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently what happens when orientation changes is: 1. Application gets notification that status pane size has changed. 2. Qt resizes S60Data to new size, and sends resize event. 3. Application redraws itself. But style is still using incorrect screen size internally, so background brush is incorrect. Redrawing thus might showup white rect on-screen. 4. Style gets notification that orientation is changed and style then deletes existing background brush. 5. Style creates a new background brush and sends events to all toplevel widgets that style has changed 6. Widgets might draw themselves with new style background brush. What this fix changes is: 1. When application first tries to redraw itself, style notices that the background brush size does not match to active screen size. 2. Style immediately re-creates background brush 3. Since cachekey for pixmaps won't match, new background is not drawn until after background brush has been updated to application palette. 4. Due to #1 style needs to remove deletion of background brush from clearCaches to avoid deleting (and re-creating) background twice. Task-number: QTBUG-6428 Reviewed-by: Janne Koskinen
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-221-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Use 3x3 PMV matrices rather than 4x4 in the GL2 engine Handle broken shaders better in the GL2 engine's shader manager Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram Fix build with neon instructions enabled but not set in mkspec