summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-0225-252/+335
|\ | | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tests/auto/selftests/expected_skip.txt tests/auto/selftests/tst_selftests.cpp
| * Fixes possible infinite loop in QApplication::topLevelAtJoão Abecasis2009-06-021-4/+4
| | | | | | | | | | KDE Bug: https://bugs.kde.org/show_bug.cgi?id=191759 Reviewed-by: Bradley T. Hughes
| * My changes for Qt 4.5.2.Norwegian Rock Cat2009-06-021-0/+18
| | | | | | | | Better late than never.
| * Improve readability of QDFBWindowSurface::scrollAnders Bakken2009-06-011-21/+18
| | | | | | | | | | | | The batch-blits buys us nothing and this is much more readable. Reviewed-by: TrustMe
| * Fixed failure of tst_Selftests::checkXML.Rohan McGovern2009-06-013-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-pick of 548da9a5434d615456a7a6efda3380b7138c6000 and some earlier changes predating public repo. Note that this test is not failing if using Qt 4.5 only. However, it fails if using Qt 4.5 selftests against Qt master testlib. We want to be able to use master testlib to run 4.5 testcases, and this change does no harm when using Qt 4.5 testlib, so backport it to 4.5 for convenience. Original change description follows: A few tests use printf, which means they interfere with the XML test logging. Blacklist them for the XML test. Note that these tests happened to pass under the old test logger implementation. That was because the test logger always printed XML tags on a single line, and the printf calls contained no special XML characters. The test logs generated were technically valid XML but contained extraneous text.
| * Don't support porter duff |= source overAnders Bakken2009-05-291-96/+24
| | | | | | | | | | | | | | | | DirectFB and Qt treats these things rather differently so the mapping just doesn't work very well. Only use DirectFB for SourceOver stuff (which is the default mode anyway) Reviewed-by: Donald <qt-info@nokia.com>
| * Removed nested comment signature in the doc to fix a warning.Denis Dzyubenko2009-05-291-1/+1
| | | | | | | | Reviewed-by: David Boddie
| * Remove unused variable.Alexis Menard2009-05-291-1/+0
| |
| * Fixed a crash in the GL 2 paintengine when drawing text.Trond Kjernåsen2009-05-291-0/+3
| | | | | | | | | | | | | | | | The new glyph cache may return null images for e.g. space characters. Task-number: 253468 Reviewed-by: Samuel BT: yes
| * Remove the fixFilename() usage from the solution generatorMarius Storm-Olsen2009-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | Only the Solution Generator was using the fixFilename() function, so under some circumstances the solution filename wouldn't find the correct vcproj file to include. This created a problem with network-chat.vcproj. Task-number: 254772 Reviewed-by: joao
| * New configure.exe binaryMarius Storm-Olsen2009-05-291-0/+0
| | | | | | | | | | | | Task-number: 254451 Reviewed-by: trustme BT: yes
| * Only display the choice of license if we can find the filesMarius Storm-Olsen2009-05-291-20/+23
| | | | | | | | | | | | Task-number: 254451 Reviewed-by: eskil BT: yes
| * Fixed build issues with MSVCThierry Bastian2009-05-292-8/+22
| | | | | | | | | | | | | | | | | | | | in atomic operations, we declare Interlock... functions in the namespace That can confuse the compiler because they are also declared in another header outside the namespace. Same problem in clucene where we include windows.h from within the NS. Task-number: 254214 Reviewed-by: ogoffart
| * Doc - marked QFileDialog::setOption() with the since 4.5 tag.Kavindra Devi Palaraja2009-05-291-2/+3
| | | | | | | | | | Task-number: 254549 Reviewed-by: TrustMe
| * Changes for DirectFBAnders Bakken2009-05-281-0/+20
| | | | | | | | Reviewed-by: TrustMe
| * Remove all force raster on RGB32 stuffAnders Bakken2009-05-284-75/+32
| | | | | | | | | | | | | | | | | | Previously we allowed RGB32 but forced fallbacks for all drawing operations. It turns out blitting operations doesn't work right either so we'll rather just disallow this format altogether. See also 36ae58e7a6a888d3ae7bd162d59daada550bbfb1 Reviewed-by: Donald <qt-info@nokia.com>
| * Warn when trying to use an unsupported formatAnders Bakken2009-05-281-5/+10
| | | | | | | | | | | | | | Due to incompatibilities between RGB32 in DirectFB and Qt we can't use RGB32. Reviewed-by: Donald <qt-info@nokia.com>
| * Fix a ASSERT/Crash when adding two times the same QAction to a QGW.Alexis Menard2009-05-282-2/+20
| | | | | | | | | | | | | | | | | | We were adding two times in the QActionPrivate list the entry for the current QGraphicsWidget if the action was existing before. Task-number:KDE Reviewed-by:bnilsen BT:yes
| * Fix wrong sorting when using the QFileSystemModel with QTreeViewAlexis Menard2009-05-284-4/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An optimization was made to the sorting of QFileDialog to sort only the current root (meaning what the user see). This avoided slowness when the model was big with lots of leafs. The problem here is for the treeview, the root is always the same, we expands only nodes. In that case, a recursive sorting is needed to ensure that all expanded nodes are correctly sorted (and filtered). This will be slower that's why i use an hidden flag in the d pointer to deactivate the recursive sort for the QFileDialog. Task-number:254701 Reviewed-by:olivier BT:yes
| * cosmetic changes to examples/dialogs/sipdialogJoerg Bornemann2009-05-282-8/+7
| | | | | | | | | | | | | | | | main function has a return value now. On the HTC this example didn't work, because this stupid thing sends two resize events, if the SIP is opened (and only one if it is closed). Reviewed-by: mauricek
| * Scroll the dirty region with WA_PaintOnScreenBenjamin Poulain2009-05-281-0/+2
| | | | | | | | | | | | | | | | When QWidget::scroll() is called on a widget with WA_PaintOnScreen, scroll the dirty region. Task-number: 254742 Reviewed-by: bnilsen
| * Fixed a problem with streaming QIcons containing multiple pixmaps.Trond Kjernåsen2009-05-282-3/+49
| | | | | | | | | | | | | | | | | | If pixmaps were added through QIcon::addFile() with different sizes than the sizes of the pixmaps themselves, streaming the icon in didn't work properly. Task-number: 254374 Reviewed-by: Kim
| * Minor cleanup.Trond Kjernåsen2009-05-281-4/+4
| | | | | | | | Reviewed-by: Kim
* | Fixed bug in QClipData::fixup().Samuel Rødal2009-06-022-2/+24
| | | | | | | | | | | | | | 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.
* | 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.