summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-09-07324-4581/+3215
|\
| * 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-061-0/+14
| | | | | | | | Reviewed-by: trustme
| * Update QGLFormat::operator== to include all fields.Rhys Weatherley2009-09-062-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-061-4/+0
| | | | | | | | Reviewed-by: Alex
| * Make QGraphicsShaderEffect private API for 4.6Rhys Weatherley2009-09-067-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-051-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
| | * | Fixed tst_QFiledialog::filesSelectedSignal where the selected directory to runGabriel de Dietrich2009-09-042-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | the test may not have any file on it. Reviewed-by: Olivier
| | * | Implement symbol hiding for JSC's JIT functions.Thiago Macieira2009-09-041-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These functions are implemented directly in assembly, so they need the proper directives to enable/disable visibility. On ELF systems, it's .hidden, whereas on Mach-O systems (Mac) it's .private_extern. On Windows, it's not necessary since you have to explicitly export. I also implemented the AIX idiom, though it's unlikely anyone will implement AIX/POWER JIT. That leaves only HP-UX on PA-RISC unimplemented, from the platforms that Qt supports. It's also unlikely that we'll imlpement JIT for it. Reviewed-by: Kent Hansen
| | * | Added multiple frames to QPaintBuffer.Samuel Rødal2009-09-044-72/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets us stream a single QPaintBuffer instead of one QPaintBuffer per frame in the trace graphicssystem, which leads to not streaming pixmaps / images once per frame. Performance when doing a trace is also a lot better for painting heavy applications. Reviewed-by: Trond
| | * | Avoided streaming multiple copies of images/pixmaps in QPaintBuffer.Samuel Rødal2009-09-041-1/+74
| | | | | | | | | | | | | | | | | | | | | | | | This reduces the size of the trace files significantly in certain cases. Reviewed-by: Trond
| | * | Fix tst_QTimer::moveToThread() on WindowsBradley T. Hughes2009-09-042-5/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We shouldn't fully unregister timers when the event dispatcher is stopped when a thread exits, since this releases the timerId back to the pool. Instead, only free the OS resources. Auto-test included. Reviewed-by: ogoffart
| | * | Optimize qt_format_text test operations: try not to detachOlivier Goffart2009-09-041-40/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Second try. This is a fixed version of the one reverted in commit 25014061b8de The difference is that it does text[offset] = QChar::LineSeparator; instead of chr = QChar::LineSeparator; Reviewed-by: Eskil
| | * | Fix crashes when moving descendents during destruction.Andreas Aardal Hanssen2009-09-042-7/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix prevents crashes in QGraphicsItem caused by calls to pure virtual functions as an item tries to access its dying parent. This happens when an item is moved by an ancestor during this ancestor's destructor. Autotests included. Reviewed-by: bnilsen
| | * | Don't call pure virtuals on deleting QGraphicsItemAaron Kennedy2009-09-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | This also needs to be reviewed by andreas. Reviewed-by: Michael Brasser
| | * | Make the view in the flowlayout example big enough.Jan-Arve Sæther2009-09-041-0/+1
| | | |
| | * | Make sure that top-level windows respect hfw/wfh constraint.Jan-Arve Sæther2009-09-043-25/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that the constraint is only enforced when resizing the window interactively. Calling setGeometry() will not try to enforce the constraint. See the graphicsview/flowlayout example for a "manual test". Task-number: 257455
| | * | QGraphicsWidget::sizeHint didn't pass the correct constraint to layout.Jan-Arve Sæther2009-09-041-2/+4
| | | | | | | | | | | | | | | | | | | | Adjust the constraint with the widget margin before passing it on to d->layout->effectiveSizeHint().
| | * | Minor fixes to the graphicsview/flowlayout exampleJan-Arve Sæther2009-09-042-13/+17
| | | |
| | * | Remove implicit margin on bulleted lists when exporting to HTMLEskil Abrahamsen Blomfeldt2009-09-042-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we export a bulleted list to HTML, we add a meta-block around the list items to set the bullet style of the list (<ul> or <ol>.) This block will implicitly have a margin, even if the list itself does not in the internal document. The result is that exporting a list to HTML and then reloading it will give a different apperance, because the 0 margin of the original was not saved. The fix is to always set the meta-block's margin to 0, since it is only there to set the bullet style and should not affect the layout at all. Task-number: 201228 Reviewed-by: Simon Hausmann
| * | | Added Symbian to our list of Tier1 platformsEspen Riskedal2009-09-041-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | At the moment we only support S60 3.1, 3.2 and 5.0. Once Symbian Platforms actually gets publicly released we'll add those too. Reviewed-by: Volker Hilsheimer Reviewed-by: Jason Barron
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-09-04677-5812/+12440
| |\ \
| | * | Make QGLFramebufferObject::isBound() check it is the bound fboTom Cooksey2009-09-041-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, it was possible that painting using QPainter to a different GL target (E.g. QGLWidget) would unbind the FBO. In such cases, isBound returned true, even though the FBO wasn't bound to any context. Reviewed-by: Samuel
| | * | 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.
| | * | %SystemDrive% folder created in current directory on Windows 7.Prasanth Ullattil2009-09-041-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happens only when the standarddialogs demo is run from qtdemo. On Windows 7, calling the GetOpenFileName() caches something in %SystemDrive%\ProgramData\Microsoft\Windows\Caches. qtdemo was removing all environment variables other than PATH for the child processes. This caused the example to dump the cache in current directory instead. Task-number: 260898 Reviewed-by: Jens Bache-Wiig
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-09-04303-4888/+2936
| | |\ \
| | | * | Slightly improved QGLFramebufferObjectFormat API.Samuel Rødal2009-09-045-21/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming setInternalFormat() to setInternalTextureFormat() (and similarly for the accessor) makes the API a bit more explicit. Reviewed-by: Trond
| | | * | QAbstractSocket: Missing initializationsMarkus Goetz2009-09-042-1/+5
| | | | |
| | | * | QHostInfoPrivate: Uninitialized intMarkus Goetz2009-09-041-2/+3
| | | | |
| | | * | QNetworkAccessManager: Missing break in proxyAuthenticationKeyMarkus Goetz2009-09-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This probably made the proxy authentication saving for ftp proxies not working. Reviewed-by: Thiago