summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix QLabel::sizeHint()Eskil Abrahamsen Blomfeldt2010-03-251-1/+4
| | | | | | | | | | | | The QTextControl case of QLabel calculated the bounding rect of the label by taking the size of the control (floating point) and using toSize() to convert this to an integer QSize. While this would work when the font engine always returned integer values, it is not the correct way to calculate a bounding rect, since the bounding rect needs to contain all the pixels of the text, including the ones that are only partially covered, thus its size should never be rounded down. Reviewed-by: Olivier
* Fix QFontMetrics::height() and QFontMetrics autotestEskil Abrahamsen Blomfeldt2010-03-252-3/+3
| | | | | | | | | | | | | | Since the Mac font engine has been fixed to support fractional metrics, we can no longer expect qRound(A + B) to be equal to qRound(A) + qRound(B). The documentation states that height = ascent + descent + 1. To honor this contract, we need to rewrite the implementation of height() to round each metric separately. Same with lineSpacing. The bearingIncludedInBoundingrect() test was wrong. We can guarantee that the italic text is not more narrow than the normal text, but we cannot guarantee that they are never the same width. Reviewed-by: Olivier
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-2433-163/+584
|\
| * Auto test for commit 4a4458d1cf5ec7885c6f63f739b7ee80c70ad211Gabriel de Dietrich2010-03-241-0/+30
| | | | | | | | | | Reviewed-by: Trust me Task-number: QTBUG-9216
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-2413-38/+43
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Inverted sorting arrows on QHeaderViews is intentional on GNOME Fix compilation for winCE Revert "Sort indicators displayed incorrectly in GTK style" Fix warnings in the declarative module compile fix for mingw (also removes some warnings) Sort indicators displayed incorrectly in GTK style
| | * Inverted sorting arrows on QHeaderViews is intentional on GNOMEGabriel de Dietrich2010-03-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It follows the GNOME HIG as specified in http://library.gnome.org/devel/hig-book/stable/controls-lists.html.en Ammending commit reversion fad919fa0fe976facc94685fd1460b4961b72c4e. Reviewed-by: jbache Task-number: QTBUG-9299
| | * Fix compilation for winCEThierry Bastian2010-03-241-1/+2
| | |
| | * Revert "Sort indicators displayed incorrectly in GTK style"Gabriel de Dietrich2010-03-241-2/+2
| | | | | | | | | | | | | | | | | | This reverts commit 74ce3dea8b3ea06d61cef4e729f6a95f670461fe. The sorting order is intentional.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-2313-41/+43
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix warnings in the declarative module compile fix for mingw (also removes some warnings) Sort indicators displayed incorrectly in GTK style
| | | * Fix warnings in the declarative moduleThierry Bastian2010-03-233-3/+3
| | | |
| | | * compile fix for mingw (also removes some warnings)Thierry Bastian2010-03-239-36/+38
| | | |
| | | * Sort indicators displayed incorrectly in GTK styleGabriel de Dietrich2010-03-231-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Thierry Task-number: QTBUG-9299
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-244-4/+33
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Added extra video buffer handle types. QuickTime MovieViewOutput: remove view from layout and reset source
| | * | Added extra video buffer handle types.Dmytro Poplavskiy2010-03-242-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | XvShmImageHandle for XVideo shared memory image on X11 and and CoreImageHandle for CIImage on Mac OS X. Reviewed-by: Justin McPherson
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-221182-20115/+40407
| | |\ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-161-1/+1
| | |\ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-15177-3724/+5250
| | |\ \ \ \
| | * | | | | QuickTime MovieViewOutput: remove view from layout and reset sourceDmytro Poplavskiy2010-03-112-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | movie when MovieViewOutput output is disabled. Reviewed-by: Justin McPherson
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-2315-121/+478
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed usage of xplatform in configure. Fixed mif generation on symbian-abld. Fixed regular expression matching. More fool proof way for finding these headers Merge symbianutils from qtcreator e82219b344ee471dbb5d8e7f1351404ff9616d6c Enable installation of a sis file without running any application Replace download % display with a progress bar This file does not exist Fix configure false positives when checking for symbian Fix compile on symbian better. Make ICON generation (to symbian mif) work for relative paths/shadow builds Disable OpenVG for symbian-sbsv2 on Linux. Corrected wrong header casing. Moved -s60 and -usedeffiles options docs to Symbian section. Added rpp and rsg files to ignore filter. Forced little endianness when using symbian-sbsv2 mkspec. Fixed incorrect platform string when building for Symbian. Added -qt-style-s60 to Symbian configure options on Linux.
| | * \ \ \ \ \ Merge branch 'configureFixes' into 4.7-s60axis2010-03-232-8/+42
| | |\ \ \ \ \ \
| | | * | | | | | Fixed usage of xplatform in configure.axis2010-03-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | XQMAKESPEC contains the full path, so don't use that, since the full path could contain "symbian" by accident.
| | | * | | | | | Merge branch 'linux-symbian-sbsv2-support' into 4.7-s60axis2010-03-232-8/+42
| | | |\ \ \ \ \ \
| | | | * | | | | | Disable OpenVG for symbian-sbsv2 on Linux.axis2010-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| | | | * | | | | | Corrected wrong header casing.axis2010-03-151-1/+1
| | | | | | | | | |
| | | | * | | | | | Moved -s60 and -usedeffiles options docs to Symbian section.axis2010-03-151-6/+5
| | | | | | | | | |
| | | | * | | | | | Added rpp and rsg files to ignore filter.axis2010-03-151-0/+2
| | | | | | | | | |
| | | | * | | | | | Forced little endianness when using symbian-sbsv2 mkspec.axis2010-03-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| | | | * | | | | | Fixed incorrect platform string when building for Symbian.axis2010-03-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| | | | * | | | | | Added -qt-style-s60 to Symbian configure options on Linux.axis2010-03-151-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| | * | | | | | | | Fixed mif generation on symbian-abld.axis2010-03-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have to do backslash fixing because we are using QMAKE_EXTRA_TARGETS instead of QMAKE_EXTRA_COMPILERS, which in turn is needed to get clean targets correct on the symbian/* mkspecs.
| | * | | | | | | | Fixed regular expression matching.axis2010-03-231-1/+1
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need extra backslashes, otherwise it tries to match the '|' verbatim.
| | * | | | | | | More fool proof way for finding these headersThomas Zander2010-03-231-1/+1
| | | | | | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-2313-111/+431
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Merge symbianutils from qtcreator e82219b344ee471dbb5d8e7f1351404ff9616d6c Enable installation of a sis file without running any application Replace download % display with a progress bar This file does not exist Fix configure false positives when checking for symbian Fix compile on symbian better. Make ICON generation (to symbian mif) work for relative paths/shadow builds
| | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-2313-111/+431
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Merge symbianutils from qtcreator e82219b344ee471dbb5d8e7f1351404ff9616d6c Enable installation of a sis file without running any application Replace download % display with a progress bar This file does not exist Fix configure false positives when checking for symbian Fix compile on symbian better. Make ICON generation (to symbian mif) work for relative paths/shadow builds
| | | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-2213-111/+431
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Merge symbianutils from qtcreator e82219b344ee471dbb5d8e7f1351404ff9616d6c Enable installation of a sis file without running any application Replace download % display with a progress bar This file does not exist Fix configure false positives when checking for symbian Fix compile on symbian better. Make ICON generation (to symbian mif) work for relative paths/shadow builds
| | | | | * | | | | | | Merge symbianutils from qtcreator e82219b344ee471dbb5d8e7f1351404ff9616d6cShane Kearns2010-03-226-77/+384
| | | | | | | | | | | |
| | | | | * | | | | | | Enable installation of a sis file without running any applicationShane Kearns2010-03-221-22/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "runonphone --sis qt.sis" Would install qt to the phone without attempting to execute any test afterwards. This feature is added because people were using runonphone as a fast way to install sis files from the command shell. Reviewed-by: axis
| | | | | * | | | | | | Replace download % display with a progress barShane Kearns2010-03-221-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is to avoid flooding the console when copying a large sis file (e.g. qt.sis) to the phone. Reviewed-by: axis
| | | | | * | | | | | | This file does not existThomas Zander2010-03-221-2/+1
| | | | | | | | | | | |
| | | | | * | | | | | | Fix configure false positives when checking for symbianThomas Zander2010-03-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just check the spec instead of the full path to the spec. This avoids false positives for testing for 'symbian' in the spec name when the path to the spec contains it instead.
| | | | | * | | | | | | Fix compile on symbian better.Thomas Zander2010-03-222-4/+4
| | | | | | | | | | | |
| | | | | * | | | | | | Make ICON generation (to symbian mif) work for relative paths/shadow buildsThomas Zander2010-03-221-0/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-2312-68/+159
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | / | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Wrong repaint when changing the default row height in QTreeView tst_QObject: test signals and slots with the same name Fix warnings in tst_qobject.cpp Optimize QMetaObject::indexOf* functions Add new function QTextLine::horizontalAdvance() Fix warning on Sequential Animation Group build fix for mingw Adding the autotest for the task Fix QGraphicsEffect cache when the item is not visible by the view. Calling setX and setY should send itemSendGeometry/ScenePositionChanged events
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-232-21/+14
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: API fixes to QGLBuffer.
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-225-63/+57
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix a problem with the selection losing items when layout is changed refactor connections/disconnections in QItemSelectionModel small little change to the initialization of item views disable copy of QPainterPathStroker as its not copiable. Added warnings on non-created buffer in QGLBuffer
* | | | | | | | | | | Add QFont::ForceIntegerMetrics style strategy flagEskil Abrahamsen Blomfeldt2010-03-243-21/+53
| |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebKit uses integers internally to deal with positioning and sizing of text objects, but on Mac, Qt uses floating point values. This caused a discrepancy between the size used by WebKit to position text objects and the actual size of the objects when rendered by Qt. The problem was so bad that it has been holding back fixes for other bugs in the mac font engine since these would make the WebKit bug more visible. To work around the problem, we introduce a StyleStrategy flag in QFont which allows you to force the use of integers all over the line. This makes text rendering slightly different from native applications, but should fix several issues with WebKit on Mac. The WebKit-part of this patch will be submitted up-stream. Reviewed-by: Simon Hausmann Reviewed-by: Prasanth
* | | | | | | | | | Wrong repaint when changing the default row height in QTreeViewGabriel de Dietrich2010-03-231-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When in QTreeView::dataChanged(), we didn't check for the actual change in the value before setting QTreeViewPrivate::defaultItemHeight. Hence, if uniformRowHeights is true, we completely miss any resizing of the items. Reviewed-by: Thierry Task-number: QTBUG-9216
* | | | | | | | | | tst_QObject: test signals and slots with the same nameOlivier Goffart2010-03-231-2/+40
| | | | | | | | | |
* | | | | | | | | | Fix warnings in tst_qobject.cppOlivier Goffart2010-03-231-17/+19
| | | | | | | | | |
* | | | | | | | | | Optimize QMetaObject::indexOf* functionsOlivier Goffart2010-03-231-31/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comparing the first character before calling strcmp gives big speedup, as it avoid the overhead of calling the strcmp function in many cases. In indexOfMethodRelative, fix the normalize case. The computation of the normalized string was put outside of the for loop, but it should have been inside. This was not detected by the test because the wrong string is at the end. In IndexOfMethodRelative, we do not need to check if the method is a signal or a slot, because we only iterate over the right interval. This is only true for code generated by moc since Qt 4.6. Which means that in application compiled with Qt 4.5 and older, indexOfSignal could now return a slot with the same name (and vice-versa), but I this it is safe to ignore that "problem". Reviewed-by: Roberto Raggi Reviewed-by: Kent Hansen
generated by cgit v0.12 at 2024-11-15 06:33:58 (GMT)