summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6'Thiago Macieira2009-09-04185-1665/+5240
|\
| * Merge branch '4.5' into 4.6Thiago Macieira2009-09-0441-71/+525
| |\
| | * Fixed clipping of native style elements when raster is used on macGunnar Sletta2009-09-041-2/+6
| | | | | | | | | | | | Reviewed-by: Trond
| | * Add license headers to .l files.Jason McDonald2009-09-042-0/+82
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Add license headers to python codeJason McDonald2009-09-049-2/+368
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Remove license header as Solaris X86 assembler can't digest comments.Jason McDonald2009-09-041-40/+0
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-09-041-0/+6
| | |\
| | * | Pedantic fixes for license headers.Jason McDonald2009-09-0428-27/+69
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Fixed autotest failure in qwidget on X11 with Oxygen style.Samuel Rødal2009-09-041-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Oxygen draws a fancy background gradient etc so it's not suitable for this kind of pixel testing. Since we're testing the window surface and not the style just use the simple QWindowsStyle here. Reviewed-by: Gunnar Sletta
| * | | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-0434-776/+957
| |\ \ \
| | * | | Fix QDialog test compilation on MacOlivier Goffart2009-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | moc on Mac define itself as GCC, but does not define the __EXCEPTIONS macro. It then defined QT_NO_EXCEPTIONS and did not generate the moc output for some classes, resulting in link errors later. Reviewed-by: Gabi
| | * | | Fix license headers.Jason McDonald2009-09-042-5/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-09-0414-691/+630
| | |\ \ \
| | | * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-044-153/+172
| | | |\ \ \
| | | * | | | Modify QMatrix4x4 and QQuaternion to use qreal internallyRhys Weatherley2009-09-0414-691/+630
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some concerns were expressed about the float precision of QMatrix4x4, which this change addresses by using qreal instead. The QVector2D/3D/4D classes still use float internally, so that they can be used directly in large arrays of vertex values to be uploaded to an OpenGL server. QQuaternion is a client-side class, and it should produce rotations that are consistent with QMatrix4x4. So its precision was changed too. A consequence of this change is that the following no longer works in a portable fashion: QMatrix4x4 mat; ... glLoadMatrixf(mat.constData()); The caller must now repack the argument to convert from qreal to GLfloat. Reviewed-by: Michael Goddard Reviewed-by: Andreas
| | * | | | | Update license headersJason McDonald2009-09-0417-79/+325
| | | |/ / / | | |/| | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | Build break fixed: Added missing include to sqt60main_mcrt0.cppMiikka Heikkinen2009-09-041-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <exception> header was missing from sqt60main_mcrt0.cpp, causing Symbian builds to break. Reviewed-by: axis
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Michael Brasser2009-09-042-151/+170
| |\ \ \ \
| | * | | | Make exposeRegion work better in DFB_NO_WM modeAnders Bakken2009-09-042-118/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we didn't properly compose windows so QT_NO_DIRECTFB_WM mode would generally only work for single windows (with no popups). This also simplifies the code a lot. Previously we would among other things paint the mouse cursor twice in this mode.
| | * | | | Cache the DFBSurface for the cursor imageAnders Bakken2009-09-041-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This surface is painted every time we move the mouse cursor (in NO_DIRECTFB_WM) and doesn't change all that often so caching it is relatively easy and beneficial. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | * | | | Fix a bug in DFBWindowSurface::setGeometryAnders Bakken2009-09-041-26/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure to release the surface of a window before resizing. Seemingly certain versions of DirectFB change the surface when the window is resized. Also clean up setGeometry() Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | | | | Fix compilation on OS X.Michael Brasser2009-09-041-1/+1
| |/ / / / | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Michael Brasser2009-09-04566-4841/+14167
| |\ \ \ \ | | |/ / /
| | * | | Fix tst_QTableView with skulpture styleOlivier Goffart2009-09-031-0/+9
| | | | |
| | * | | QStyleSheetStyle test: test that the widget loose their style when they are ↵Olivier Goffart2009-09-031-0/+27
| | | | | | | | | | | | | | | | | | | | not hovered
| | * | | QCSSScanner: really skip toLower() when tokenizing the input.Ariya Hidayat2009-09-032-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing from e3c62dc1def9270761ca63c73ae76fdca9d61582 is the actual change to the (generated) scanner, namely to skip lowercase conversion for each and every character.
| | * | | Removing a few superfluous semicolons.Alessandro Portale2009-09-039-15/+15
| | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| | * | | Unbreak static compile (due to symbol conflicts).Ariya Hidayat2009-09-031-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the hex-to-RGB routines to avoid conflicts with the same functions in QtGui. We do not really want to export this function. Beside, we want to clean-up and simplify the case for #rrggbb only (the most common one for SVG).
| | * | | Merge branch 'minimizeWrapperApp' into 4.6axis2009-09-0318-416/+433
| | |\ \ \
| | | * | | Move the S60/Avkon framework initialization into QtGui.axis2009-09-0316-299/+301
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way we avoid having a lot of code in a static (and unmaintainable) library. The s60main static library now currently has only one task: to call main(). To move the initialization into QtGui also meant a change in how the S60 framework is created, because we can no longer use the trick where we create and start the the S60 event loop and then have the framework call us back to start main(). The initialization now follows the creation and destruction of QApplication, which is a lot more in line with how other platforms do it. Since S60 doesn't support creating the environment, and *then* starting it (both are executed by the same call), we had to open up the S60 framework construction classes and just mirror what they do. This means that after QApplication construction is done, the S60 framework is initialized, but nothing will run yet and control will return to main(), where the user can start the event loop himself. One of the quirks of this approach is that the construction of the S60 framework makes a new cleanup stack. This means that any active traps will not be active anymore, and leaving without setting a new trap will most likely panic. This shouldn't be a problem for us, since Qt is never supposed to leave, but it means that if anyone uses the cleanup stack without setting a new trap, they will receive a panic. It was considered to add a trap mark in QApplication construction and then removing it on destruction, but it was dropped because leaving from main() is still undefined (even if the old cleanup stack would be restored in the destructor, we wouldn't be able to stop the exception from unwinding the stack, and the cleanup stack would then be unbalanced). RevBy: Jason Barron RevBy: Janne Anttila AutoTest: QWidget passed with same failure count
| | | * | | Use custom S60 framework construction instead of RunApplication().axis2009-08-261-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60main/qts60main.cpp
| | * | | | Rendering artifacts when installing an effect on HasNoContents items.Bjørn Erik Nilsen2009-09-031-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsItem::HasNoContents is documented to not paint anything when the flag is set on an item, so all the update requests are ignored. However, we cannot ignore update requests on such items when an effect is installed on them, because when the effects changes parameters it calls update on the item. We still don't paint the item, but we processes the update request such that its children can be painted properly. Reviewed-by: Andreas
| | * | | | Fixed tst_QGraphicsWidget::ensureClipping.Gabriel de Dietrich2009-09-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new recursive scene rendering does not call GraphicsScene::drawItems. Enabling the IndirectPainting optimization flag reverts to the old behaviour. Reviewed-by: ogoffart
| | * | | | Fixed issues with using GLenum in public API on mac.Samuel Rødal2009-09-035-46/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The type of GLenum was changed between 10.4 and 10.5, so to support compiling on one and deploying on the other we need this hack. Also get rid of the complex QGLFramebufferObjectFormat constructor in favor of a simple default constructor and setters, which is more Qt-ish anyway, and avoids ambiguities on mac. Reviewed-by: Trond
| | * | | | Fix more warnings for mingwThierry Bastian2009-09-033-6/+5
| | | | | |
| | * | | | fix warnings in stickman demo on mingwThierry Bastian2009-09-036-37/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now also use the brand-new QGraphicsObject class We also make sure we have less memory leak or bad deallocation.
| | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-09-033-5/+10
| | |\ \ \ \
| | | * | | | Make sure that the dialog in the boxes demo paints window decorations.Jan-Arve Sæther2009-09-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tst_QGraphicsProxyWidget::windowFlags() demonstrates that this is intended behaviour. Reviewed-by: Kim
| | | * | | | Merge commit 'origin/4.5' into 4.6Joerg Bornemann2009-09-031-4/+7
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_win.cpp
| | | | * | | restoring a minimized window on Windows CE didn't workJoerg Bornemann2009-09-031-0/+6
| | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After restoring a minimized window we only saw the window decoration. All content was missing. That's because we don't get a WM_SIZE message for restoring the window. We must react on WM_ACTIVATE in this case. Task-number: 260702 Reviewed-by: thartman
| | | * | | Fixed incorrect file path in qimagereader autotest.Kim Motoyoshi Kalland2009-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Benjamin Poulain
| | * | | | compile since broken merge from 4.5Gunnar Sletta2009-09-032-2/+2
| | |/ / /
| | * | | Fixed bindTexture() on bigendian and older implementationsGunnar Sletta2009-09-032-4/+37
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trond
| | * | | Doc: add warnings and some more meat to Symbian specific APIs.Volker Hilsheimer2009-09-031-6/+25
| | | | |
| | * | | Fixed crash in tst_qgl.Samuel Rødal2009-09-031-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The shader manager needs to be recreated since the context it was created with might not be valid any more. Reviewed-by: Kim
| | * | | Fixed compilation of tst_qgl.Samuel Rødal2009-09-031-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 66961012e6eb494541bdc166e21f7af55eef73a5 changed the QGLFramebufferObjectFormat API, so the test needed to be updated as well. Reviewed-by: Kim
| | * | | Fix crash bug when rendering a graphicsview offscreen with effectsThomas Hartmann2009-09-031-4/+8
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Bjoern Erik Nilsen
| | * | | doc: New screen shots for graphics effect documentation.Bjørn Erik Nilsen2009-09-037-0/+0
| | | | |
| | * | | Remove tank game example from Qt Demo.Eskil Abrahamsen Blomfeldt2009-09-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tank game example no longer exists, and should not be listed here. Reviewed-by: Prasanth
| | * | | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-03273-1939/+8401
| | |\ \ \
generated by cgit v0.12 at 2024-11-15 09:03:56 (GMT)