summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed qsubmdiarea setFont test.Gabriel de Dietrich2009-09-071-1/+4
| | | | | | | The compared fonts didn't have the same styleHint because it's resolved setting the font. Reviewed-by: Olivier
* Fix tst_QItemDelegate::task257859_finalizeEdit on MacOlivier Goffart2009-09-071-1/+1
| | | | | qFindChildren<QWidget*> would also find the QFocusFrame in addition to the line edit
* Fixed resolving colors of the form "rgb(r,g,b)" in SVGs.Kim Motoyoshi Kalland2009-09-071-10/+13
| | | | | | | | | The bug was introduced by 13bcc92274d52fa6df2d636c78cf6ea457d670aa. Instead of comparing only the beginning of a string with "rgb(", a full string compare was used. I also added some error handling to avoid crashing on noncompliant SVG files. Reviewed-by: Trond
* Support setting font size in shorthand font propertiesEskil Abrahamsen Blomfeldt2009-09-072-2/+61
| | | | | | | | | | | | | | | The fontSizeAdjustment defaulted to 0 which means "medium" in internal semantics. This will override any font size you set in the short-hand. In other locations, fontSizeAdjustment defaults to -255 which has no meaning attached. To allow setting the font size in short-hand (as in "font: 20px Arial"), we can't default to a specific adjustment. Two tests are added: The first verifies the case that already worked, where you specify the font size using the "font-size" property. The other verifies the short-hand case and would previously fail. Task-number: 207189 Reviewed-by: Simon Hausmann
* Stabilize QComboBox test.Olivier Goffart2009-09-071-5/+5
| | | | On Mac, there is long fading animation before the popups hide
* Stabilize QFontMetrics testOlivier Goffart2009-09-071-3/+3
| | | | | On Mac, the text may be elided if we give the exact length as the size. Giving one pixel bigger makes sure the text is not elided
* make JavaScriptCore compile on HPUXKent Hansen2009-09-077-3/+12
| | | | | | | Get rid of circular dependency (don't include StructureChain.h from Structure.h). Disable some time stuff that isn't available on HPUX. Reviewed-by: Simon Hausmann
* Stabilize QTreeView testOlivier Goffart2009-09-071-8/+8
|
* Fixed compilation error for qmdiarea and qmdisubwindow test.Gabriel de Dietrich2009-09-071-1/+1
| | | | Reviewed-by: Olivier
* New function added to QScriptEngineAgent autotestJedrzej Nowacki2009-09-071-0/+16
| | | | | | | Function convert numeric ScriptEngineEvent::Type to QString. It is not used in test but really useful in debugging Reviewed-by: Kent Hansen
* Few expected fails were fixed in QScriptEngineAgentJedrzej Nowacki2009-09-075-20/+16
| | | | | | | | | functionExit event was partially fixed. The time point in JS execution with JIT enabled works now but still there is no returning value in few cases. Autotest was corrected. Reviewed-by: Kent Hansen
* Fix tiled blit in 16-bit modePaul Olav Tvete2009-09-071-4/+7
| | | | | | | | Optimizations in change 8e447e8a did not handle the case when the target width is less than the width of a tile. Task-number: 260759 Reviewed-by: Samuel
* Make dynamic cube maps work again in boxesRhys Weatherley2009-09-071-1/+1
| | | | Reviewed-by: trustme
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-072-2/+8
|\
| * Mark these as fix later.Bill King2009-09-071-0/+5
| | | | | | | | | | The unicode logic is beyond me, leave these for fixing by someone else with more unicode knowledge.
| * DB2 - Don't return an error when the table is just empty.Bill King2009-09-071-2/+3
| | | | | | | | | | | | Makes the behaviour consistent with the ODBC driver behaviour Reviewed-by: Justin McPherson
* | qdoc: improve the QGLFormat documentationRhys Weatherley2009-09-071-17/+20
|/ | | | Reviewed-by: trustme
* Sample buffers are on by default for OpenGL/ES 2.0, off for others.Rhys Weatherley2009-09-071-0/+6
| | | | Reviewed-by: trustme
* Unit tests for QGLFormat option constructorRhys Weatherley2009-09-071-0/+10
| | | | Reviewed-by: trustme
* Unit tests for QGLFormat::defaultFormat and ::defaultOverlayFormat()Rhys Weatherley2009-09-071-0/+41
| | | | Reviewed-by: trustme
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-071-2/+2
|\
| * Merge branch '4.5' into 4.6Rohan McGovern2009-09-071-2/+2
| |\
| | * Fixed compile on Solaris.Rohan McGovern2009-09-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `test' builtin in Solaris' /bin/sh does not understand `-e', use `-f' instead. Fixes: configure: test: argument expected Note, using the `-nokia-developer' configure option hides this breakage. Reviewed-by: Rhys Weatherley
* | | Unit tests for QGLFramebufferObjectFormatRhys Weatherley2009-09-071-0/+56
|/ / | | | | | | Reviewed-by: trustme
* | Performance: Convert QGLFormat to use implicit sharingRhys Weatherley2009-09-073-7/+56
| | | | | | | | | | | | | | | | | | | | | | | | QGLFormat was being deep-copied many times per frame because of code like this: if (context()->format().doubleBuffer()) { ... This change modifies QGLFormat to use implicit sharing to reduce the overhead of the above type of checks. Reviewed-by: Sarah Smith
* | Unit tests for QGLFormat copy constructor and operator=Rhys Weatherley2009-09-071-0/+14
| | | | | | | | Reviewed-by: trustme
* | Update QGLFormat::operator== to include all fields.Rhys Weatherley2009-09-072-1/+89
| | | | | | | | | | | | | | The documentation says "Returns true if all the options of the two QGLFormats are equal", but that's not what it was doing. Reviewed-by: Sarah Smith
* | Code cleanup: remove friend declarations for non-existent functionsRhys Weatherley2009-09-071-4/+0
| | | | | | | | Reviewed-by: Alex
* | Make QGraphicsShaderEffect private API for 4.6Rhys Weatherley2009-09-077-19/+29
| | | | | | | | | | | | | | The custom shader code in the OpenGL2 paint engine needs time to mature before we make this official public API. Reviewed-by: trustme
* | Fixed "multiple definition of `QTest::mouseActionNames'" error inRohan McGovern2009-09-061-1/+2
| | | | | | | | projects where two separate compilation units include `qtestmouse.h'.
* | Fixed compile of code which defines QT_NO_CAST_FROM_ASCII and includesRohan McGovern2009-09-051-1/+1
| | | | | | | | qtestmouse.h.
* | Merge branch '4.5' into 4.6Rohan McGovern2009-09-053-42/+14
|\| | | | | | | | | Conflicts: src/gui/itemviews/qlistview.cpp
| * Remove license header, which cannot be parsed by Sun assembler.Rohan McGovern2009-09-051-40/+0
| | | | | | | | | | Commit 2e0d78836becf24c7f27c982316cf1b4492f27aa fixed this for i386 but omitted the fix for x86_64.
| * Fix pixel snow on the combo box popup on Snow Leopard.Morten Sorvig2009-09-041-0/+1
| | | | | | | | | | | | | | | | | | On 10.5 and below the pixmap data bytes happened to be initialized by malloc, on 10.6 this is no longer the case. Revby: Gunnar Sletta <gunnar@trolltech.com> Similar to 28f94e1ef94f.
| * Wizard background images incorrect in Snow Leopard.Prasanth Ullattil2009-09-041-0/+1
| | | | | | | | | | | | | | We need to clear the QPixmap before the image is drawn using the CGContextDrawImage(). Reviewed-by: Norwegian Rock Cat
| * Fix a regression with QListView::setRowHidden() when a root index is setAndy Shaw2009-09-042-4/+16
| | | | | | | | | | | | | | | | | | When setRowHidden() was called after a root index was set then it would not actually hide the row, if a root index is not set then it worked fine. Task-number: 260879 Reviewed-by: Jan-Arve
* | Fixed compile for S60.Rohan McGovern2009-09-051-1/+1
| | | | | | | | Q_DECLARE_METATYPE must appear before qRegisterMetaType.
* | Use the right type in DFBPaintEngineAnders Bakken2009-09-041-2/+2
| | | | | | | | Reviewed-by: TrustMe
* | Only export internal raster classes in QWSAnders Bakken2009-09-042-3/+15
| | | | | | | | | | | | | | | | QRasterizer, QClipData and QRasterBuffer only need to exported when QRasterPaintEnginePrivate is subclassed which only is the case for DirectFB. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
* | Doc: Added info on Q_FLAGS() by providing an example with more context.David Boddie2009-09-042-6/+30
| | | | | | | | | | Reviewed-by: Trust Me As-seen-on: qt-interest
* | Doc: Clarified that certain KDE widgets are KDE 3 widgets.David Boddie2009-09-041-4/+4
| | | | | | | | | | Task-number: 258991 Reviewed-by: Trust Me
* | Remove unnecessary call to exposeRegion in DFBAnders Bakken2009-09-042-12/+8
| | | | | | | | | | | | | | | | | | If we make sure to erase the background to background color in connect() we don't have to do it in setGeometry. Also clean up the code in QDBWindowSurface::flush Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | QDFBScreen bgcolor is only use in non_wm modeAnders Bakken2009-09-041-4/+4
| | | | | | | | | | | | | | No need to carry those extra bytes around when QT_DIRECTFB_WM is defined. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | Remove unused function in QDFBScreenAnders Bakken2009-09-042-6/+0
| | | | | | | | Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | Handle proxywidgets better in DFBAnders Bakken2009-09-041-21/+26
| | | | | | | | | | | | | | | | This code is roughly the same as in other screen drivers. We shouldn't flush widgets that are in a graphicsscene as a proxy widget. They will be handled by the graphicsview. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into qt46Espen Riskedal2009-09-0440-251/+690
|\ \
| * | Fixed object rotations in the boxes demo.Kim Motoyoshi Kalland2009-09-042-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | When Math3D was introduced, the boxes demo was changed to use the classes in the new module, but the change caused some bugs with the object rotations. This commit should fix them. Reviewed-by: Samuel
| * | Make the example also work on a desktop with a dark theme.Thomas Zander2009-09-041-0/+1
| | |
| * | Updating line-numbers for linguist auto testsJoão Abecasis2009-09-0415-47/+52
| | |
| * | More fixes for qatomic_windows.hJoão Abecasis2009-09-041-22/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If platform headers have been included the Interlocked names may be macros and we end up with double underscores in our function names. By prefixing "Interlocked" and then the actual function names we work around that. Let's hope nobody redefines Interlocked or Increment and friends... :-) Reviewed-by: Prasanth Ullattil