summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Remove the sorting cache from the QGraphicsScene and move it to the BSP.Alexis Menard2009-06-0314-472/+631
| | | | | Now the QGraphicsScene has no idea how works the index. So we can improve it separatly, add new ones and benchmarks existing ones.
* Fix all auto-tests regressions.Alexis Menard2009-06-023-12/+16
|
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Alexis Menard2009-06-0237-225/+508
|\ | | | | | | qt-main/qgraphicssceneindex
| * Fixed bug in QClipData::fixup().Samuel Rødal2009-06-021-2/+0
| | | | | | | | | | | | | | The bounding rect computed in fixup() is one pixel too wide, causing potential memory corruption by painting outside device boundaries. Reviewed-by: Trond
| * Fix signature for QGenericMatrix::fill()Rhys Weatherley2009-06-022-3/+3
| | | | | | | | The signature was using qreal, when it should have used T.
| * Optimize QMatrix4x4::map() for QVector3D/QPoint/QPointFRhys Weatherley2009-06-021-45/+90
| | | | | | | | | | Use the matrix "flagBits" to short-cut transformations when the matrix type is identity/translate/scale.
| * QMatrix4x4::scale(qreal,qreal) and QMatrix4x4::translate(qreal,qreal) methodsAaron Kennedy2009-06-022-2/+81
| |
| * Optimize QMatrix4x4::mapRect() for translation and scale operationsRhys Weatherley2009-06-022-30/+65
| |
| * prepend private/ for included private headersMartin Jones2009-06-0110-10/+10
| |
| * Merge branch 'review/master'Marius Bugge Monsen2009-05-298-27/+25
| |\
| | * Fix compilation with -pedanticDavid Faure2009-05-297-24/+24
| | |
| | * Merge branch 'master' of git://gitorious.org/qt/qtDavid Faure2009-05-29437-5241/+24966
| | |\
| | * | static method, no instance neededDavid Faure2009-05-291-1/+1
| | | |
| | * | Merge branch 'master' of git://gitorious.org/qt/qtDavid Faure2009-05-228-1187/+54
| | |\ \
| | * \ \ Merge branch 'master' of git://gitorious.org/qt/qtDavid Faure2009-05-2121-214/+137
| | |\ \ \
| | * \ \ \ Merge branch 'master' of git://gitorious.org/qt/qtDavid Faure2009-05-2089-354/+1025
| | |\ \ \ \
| | * | | | | remove unused line (the function is even in qtgui nowadays)David Faure2009-05-181-2/+0
| | | | | | |
| * | | | | | Wrong default argument for my previous fix.Norwegian Rock Cat2009-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Argh! This was a private function and I assumed that I had the boolean correct, but I was wrong. Anyway, we don't need to do the group fade be default ever, so always have it false.
| * | | | | | Made GL2 engine default for QGLWidget, and added GL2 sync() functionSamuel Rødal2009-05-295-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To allow mixing QPainter and raw OpenGL commands we need to have some way for the user to say that's he's about to use raw OpenGL so that we are free to do buffering optimizations in the paint engines and use either GL1 or GL2 paint engine. As there's already a syncState() function in QPaintEngine we've reused this and added QPaintEngineEx::sync() which takes care of syncing/flushing the paint engine. Reviewed-by: Trond
| * | | | | | Added check in GL pixmap backend to fall back to raster if FBO fails.Samuel Rødal2009-05-291-32/+37
| | | | | | |
| * | | | | | Remove icon when setting an empty window icon on X11.Denis Dzyubenko2009-05-291-22/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to leave _NET_WM_ICON set forever, and removing an IconPixmapHint from WMHints didn't work properly. Reviewed-by: Bradley T. Hughes
| * | | | | | Doc - some changes to fix a qdoc warningKavindra Devi Palaraja2009-05-291-2/+2
| | | | | | |
| * | | | | | Do not hide the left edge of widget in statusbarOlivier Goffart2009-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Could be caused by change d2cba538 Reviewed-by: jbache Task-number: 254083
| * | | | | | Fix qstringbuilder documentation.hjk2009-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It was using !fn instead of \fn accidentally.
| * | | | | | Mac: App menus reactivated when a sheet is used on a modal dialog.Richard Moe Gustavsen2009-05-291-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to check all window anchestors of the sheet to make sure that there it is not in effekt application modal Task-number: 254543 Reviewed-by: Trenton Schulz
| * | | | | | Ensure a hierarchy of menus fade out together.Norwegian Rock Cat2009-05-294-33/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac OS X, when you have a large hierarchies of menus and you select the item at the end of the hierarchy. It will flash and then the rest will fade out at the same time. Qt would do a phased approach which was what no one expected. Introduce a QMacWindowFader class that can hold an arbitrary number of qwidgets and then on command fade them all down pased on the set duration. The API is a bit clumsy but is prefect for this internal API. Task-#: 251700 Reviewed-by: Richard Moe Gustavsen
* | | | | | | Add an API to know the indexed rect of the index.Alexis Menard2009-05-295-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usefull for the POV of the scene and let the BSP update its internal structure before the next event loop reentrancy.
* | | | | | | Fix a wrong parenting.Alexis Menard2009-05-291-1/+1
| | | | | | |
* | | | | | | First bunch of changes after an very first API reviewAlexis Menard2009-05-2915-780/+857
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This basically move some logic from the scene to the index base class. Lot of work need to be done in order to benefits from the device transform. The sorting needs to be move in the BSP tree.
* | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Alexis Menard2009-05-29652-11009/+33641
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | qt-main/qgraphicssceneindex
| * | | | | | Fixed compile with MinGW.Rohan McGovern2009-05-291-3/+3
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | MinGW 3.4.5 can't figure out the automatic QLatin1Char -> QString conversion in this code.
| * | | | | Fixed compile of Qt/Embedded.Rohan McGovern2009-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix what looks like the result of a `git merge' gone wrong.
| * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtMichael Brasser2009-05-281-1/+1
| |\ \ \ \ \
| | * | | | | Fixed WinCE compile, perhaps.Rohan McGovern2009-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix obvious typo: frosmUtf16 -> fromUtf16
| * | | | | | Export symbol needed by the declarative module.Michael Brasser2009-05-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Leo
| * | | | | | Further optimized fast scaling of ARGB8565 images onto RGB16 images.Michael Brasser2009-05-282-5/+11
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves performance on embedded. Reviewed-by: Samuel
| * | | | | Fixed bug in GL graphics system when painting to pixmaps.Samuel Rødal2009-05-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure the correct texture unit is active when copying from the pixmap to the FBO in begin().
| * | | | | Integrate merge-request #548 into branch 'master'Norwegian Rock Cat2009-05-281-2/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Brad Hards (2): Remove duplicate qpdf_p.h include. Fix build when compiling Qt using -no-opengl configuration. Request-url: http://gitorious.org/qt/qt/merge_requests/548 Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
| | * | | | | Remove duplicate qpdf_p.h include.Brad Hards2009-05-281-2/+0
| | | | | | |
| * | | | | | oops, build was broken on embeddedThierry Bastian2009-05-281-1/+1
| | | | | | |
| * | | | | | Polished aboutQt dialog a little bit.Denis Dzyubenko2009-05-281-5/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Splitted text in the AboutQt dialog into several chunks to make use of advanced qmessagebox text fields Reviewed-By: Trenton Schulz
| * | | | | Merge branch '4.5'Tom Cooksey2009-05-282-3/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/embedded/qkbdtty_qws.cpp
| | * | | | | Don't assume the tty was in K_XLATE when application startedTom Cooksey2009-05-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, query the mode at startup, store it and restore it on exit. Reviewed-By: TrustMe Task-number: 254194
| | * | | | | BT: aboutQt dialog is too big.Denis Dzyubenko2009-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make use of setInformativeText in qmessagebox for aboutQt dialog for now. Proper fix might be to add scrollable widget to the dialog, or split the about info into several pieces, though it cannot be done in a patch release. Task-number: 254464 Reviewed-by: Trenton Schulz
| * | | | | | Fixed incorrect handling of composition modes in GL2 paint engine.Samuel Rødal2009-05-282-22/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even if the source pixels are opaque we have to enable blending for the non-trivial composition modes. Some of the composition modes are independent of source alpha and depend on destination alpha for example. Reviewed-by: Tom
| * | | | | | Forgot to close the TTY handle.Robert Griebl2009-05-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | | | Introduce a new class QStringBuilder to speed up the creation ofhjk2009-05-285-3/+373
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QString objects from smaller chunks. The QStringBuilder class: QStringBuilder uses expression templates (using the '%' operator) to postpone any actual concatenation until it is assigned to an actual QString. At that time it knows the exact sizes of all chunks, can compute the required space, allocates once a QString of appriopriate size and then copies over the chunk data one-by-one. In addition, QLatin1Literal is a drop-in replacement for QLatin1String (which we can't change for compatibility reasons) that knows its size, therefore saving a few cycles when computing the size of the resulting string. Some further saved cycles stem from inlining and reduced reference counting logic (the QString created from a QStringBuilder has typically ref count equal to 1, while QString::append() needs an extra test) Minor changes to the existing QString class: - Introduce QString constructor to create an uninitialized QString of a given size. This particular constructor is used by QStringBuilder class. - Introduce a QT_USE_FAST_CONCATENATION macro to disable the existing overloads of operator+() and helps finding the places where they are used in code. - Introduce QT_USE_FAST_OPERATOR_PLUS. This also disables the existing overloads of operator+() and creates a new templated operator+() with identical implementation of operator%(). This allows code that is compilable QT_CAST_{TO,FROM}_ASCII to use QStringBuilder almost transparently. The only case that is not covered is creating objects like QUrl that are implicitly constructible from a QString from a QStringBuilder result. This needs to be converted explicitly to a QString first, e.g. by using QUrl url(QString(QLatin1String("http://") + hostName)); Reviewed-by: MariusSO
| * | | | | | Compile fix with namespaces.hjk2009-05-289-7/+30
| | | | | | |
| * | | | | | Make WA_TranslucentBackground work for QGLWidgets on X11/EGLTom Cooksey2009-05-281-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| * | | | | | Send ParentChanged event to QGLWidgets when the wId changes on EGLTom Cooksey2009-05-281-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EGL has window surfaces which are bound to a particular window ID. When that window ID changes, the EGL surface must be re-created. This is achieved by sending the QGLWidget a ParentChanged event. Reviewed-By: Trond