summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* Add some performance tests for QMatrix4x4Rhys Weatherley2009-06-023-0/+268
|
* Unit tests for 2D QMatrix4x4::translate() and scale()Rhys Weatherley2009-06-021-0/+40
|
* 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-023-30/+179
|
* prepend private/ for included private headersMartin Jones2009-06-0110-10/+10
|
* Merge branch 'review/master'Marius Bugge Monsen2009-05-299-28/+26
|\
| * Fix compilation with -pedanticDavid Faure2009-05-297-24/+24
| |
| * Merge branch 'master' of git://gitorious.org/qt/qtDavid Faure2009-05-29851-11332/+63416
| |\
| * | typo fixDavid Faure2009-05-291-1/+1
| | |
| * | static method, no instance neededDavid Faure2009-05-291-1/+1
| | |
| * | Merge branch 'master' of git://gitorious.org/qt/qtDavid Faure2009-05-2232-1253/+158
| |\ \
| * \ \ Merge branch 'master' of git://gitorious.org/qt/qtDavid Faure2009-05-2165-585/+1309
| |\ \ \
| * \ \ \ Merge branch 'master' of git://gitorious.org/qt/qtDavid Faure2009-05-20182-2838/+4549
| |\ \ \ \
| * | | | | 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-296-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | |
* | | | | | Fixed docs for task 254824.Friedemann Kleint2009-05-291-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: 254824
* | | | | | Enable overriding of the factory functions of QUiLoader.Friedemann Kleint2009-05-294-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move initialization of QAction/QActionGroups elsewhere. Detect the root widget by checking its parent against the parent widget passed in and apply only the size part of the geometry property to it. Task-number: 254824 Initial-patch-by: joao <joao@abecasis.name>
* | | | | | 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
* | | | | | Added the -showinternal flag to qdoc.Martin Smith2009-05-294-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you set -showinternal on the command line, qdoc will include everything marked \internal in the documentation. This flag is not very useful at the moment for two reasons: (1) It generates hundreds of qdoc errors because most of the things marked with \internal don't have any documentation anyway, or the documentation has other errors in it that weren't being detected because of the \internal. (2) There is a bus error toward the end, which I haven't tracked down yet. For now, use -showinternal at your own risk.
* | | | | | Fix qstringbuilder documentation.hjk2009-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It was using !fn instead of \fn accidentally.
* | | | | | extend QStringBuilder benchmark to handle QT_NO_CAST_FROM_ASCII defined andhjk2009-05-292-56/+122
| | | | | | | | | | | | | | | | | | | | | | | | undefined.
* | | | | | Call QFormBuilderExtra::instance lessJoão Abecasis2009-05-291-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Friedemann Kleint
* | | | | | 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
* | | | | | 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().
* | | | | QStringBuilder benchmark: make testing of the drop-in replacement ↵hjk2009-05-282-17/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operator+() easier. This adds a few explicit QString(...) casts around operator+() based expressions to make them acceptable for QCOMPARE.
* | | | | Integrate merge-request #548 into branch 'master'Norwegian Rock Cat2009-05-282-5/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | Fix build when compiling Qt using -no-opengl configuration.Brad Hards2009-05-281-3/+6
| | | | | |
| * | | | | 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
* | | | | small cleanup on the sub-attaq demoThierry Bastian2009-05-286-9/+6
| | | | | | | | | | | | | | | | | | | | removed declaration of properties that are already declared in Qt
* | | | | Removed dead code ifdefed with QDOC2DOXMartin Smith2009-05-285-2240/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes were added to qdoc in the days when we thought we might switch to doxygen. Now we have taken the approach of making qdoc output be more doxygen-like, so this ifdefed code is now dead.
* | | | | Merge branch '4.5'Tom Cooksey2009-05-287-28/+42
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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: Support saving forms with resources more than once in Qt JambiEskil Abrahamsen Blomfeldt2009-05-281-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a form is loaded, Designer will set the path to the resource as an absolute path rather than the path actually stored in the file. There is code to work around this to make file paths relative when saving the file later on, but no work around for Qt Jambi. So when saving Qt Jambi forms, you would get an absolute path to the resource which contains the location of the resource file (.jar or on disk) This of course breaks the concept of resources, as the .jui file was no longer portable. The fix is to special case Qt Jambi resources and set the relative path when loading them. The patch has no effect on regular Designer. Task-number: 254621 Reviewed-by: Kai Koehne
| * | | | | support for -ltcg configure switch for Windows CE buildsJoerg Bornemann2009-05-282-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally we turn -ltcg on by default on Windows CE. See commit 56191830 for details. Reviewed-by: mauricek BT: yes
| * | | | | 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