summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'review/master' into stagingJiang Jiang2011-07-2018-62/+256
|\
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-1914-31/+194
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Move separator skipping to proper place Skip shaping for hidden line/paragraph separators Support interface orientation for uikit. Add support for opening LinuxInput devices exclusively ('grabbing'). Fixed regression in compilerwarnings. Properly quit the input event thread in the directfb platform plugin. Apply 57993ba7 properly to 4.8 Deprecate some QPixmap functions (marked as obsolete already). Deprecate some functions in QImage (that have been obsolete since 4.1).
| | * Move separator skipping to proper placeJiang Jiang2011-07-192-6/+7
| | | | | | | | | | | | | | | | | | So that it won't crash some places that requires shaping results. Reviewed-by: TrustMe
| | * Skip shaping for hidden line/paragraph separatorsJiang Jiang2011-07-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we are not going to draw them in QTextLine::draw either, and shaping them here will cause performance issue on certain systems like Mac OS X 10.7 (most fonts don't have glyph for U+2028, while font fallback handling in Core Text slowed down a bit). Task-number: QTBUG-20252 Reviewed-by: Eskil
| | * Support interface orientation for uikit.Eike Ziller2011-07-187-19/+155
| | | | | | | | | | | | | | | Rotates app status bar. Adheres to UISupportedInterfaceOrientations and UIInterfaceOrientation.
| | * Add support for opening LinuxInput devices exclusively ('grabbing').Mirko Vogt2011-07-182-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LinuxInput stack exposes the ioctl EVIOCGRAB which allows LinuxInput devices being opened exclusively ('grabbed'). This patch adds support for configuring how Qt should treat LinuxInput devices (via the 'grab'-argument). By default devices are not grabbed, so not opened exclusively (matches prior behaviour). This however means all input (keystrokes, etc.) is passed to other applications (shells/ttys included) accessing respective device(s) as well. Merge-request: 2637 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
| | * Fixed regression in compilerwarnings.Samuel Rødal2011-07-151-3/+1
| | | | | | | | | | | | We can't mark QImageTextKeyLang as deprecated.
| | * Properly quit the input event thread in the directfb platform plugin.Samuel Rødal2011-07-141-0/+2
| | | | | | | | | | | | Reviewed-by: Girish Ramakrishnan
| | * Apply 57993ba7 properly to 4.8Jiang Jiang2011-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | | Because we have moved alignLine from qtextlayout.cpp to QTextEngine, this patch has to be applied manually. Reviewed-by: TrustMe
| | * Deprecate some QPixmap functions (marked as obsolete already).Samuel Rødal2011-07-121-3/+7
| | | | | | | | | | | | Reviewed-by: Olivier Goffart
| | * Deprecate some functions in QImage (that have been obsolete since 4.1).Samuel Rødal2011-07-121-7/+10
| | | | | | | | | | | | Reviewed-by: Olivier Goffart
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-124-30/+61
| |\ \ | | |/ | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Add QLocale::toUpper/Lower
| | * Add QLocale::toUpper/LowerLars Knoll2011-07-124-30/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The toUpper/Lower() methods in QString should not be locale dependent, as this can lead to rather hard to find bugs in at least a turkish locale. Rather have explicit, locale dependend case conversions available in QLocale. Reviewed-by: Denis Dzyubenko
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-121-1/+1
| |\ \ | | |/ | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Fix warning for uninitialized variable
| | * Fix warning for uninitialized variableJiang Jiang2011-07-121-1/+1
| | | | | | | | | | | | Reviewed-by: Eskil
* | | Merge remote branch 'review/master' into stagingJiang Jiang2011-07-129-50/+79
|\ \ \ | |/ /
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-111-1/+1
| |\ \ | | |/ | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Fix compiler warning in qtextdocument.cpp
| | * Fix compiler warning in qtextdocument.cppEskil Abrahamsen Blomfeldt2011-07-111-1/+1
| | | | | | | | | | | | | | | | | | Missing QLatin1String() wrapper to ensure codec of text. Reviewed-by: Jiang Jiang
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-115-21/+30
| |\ \ | | |/ | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Fix crash when app font is added Use truncate only for subpixel boundingBox x position
| | * Fix crash when app font is addedJiang Jiang2011-07-113-19/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loading app fonts will clear the application font cache, but QFontPrivate::engineWithScript will try to load the font again, in Mac the font engine used here must be the one used for shaping, because subsequent sub font engines may be added to it during the shaping process (QCoreTextFontEngineMulti::stringToCMap). That is why we need to fetch the font engine directly from QTextEngine's fontEngine cache instead of QFontCache. Task-number: QTBUG-20250 Reviewed-by: Eskil
| | * Use truncate only for subpixel boundingBox x positionJiang Jiang2011-07-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Lion, Core Text starts to return fractional values for x origin in the glyph bounding box. To get correct alignment we need to make it integer, it seems that round will cut certain pixels (x = 0.6 will be round to 1, then that glyph will be moved too much to the left in image glyph cache). Reverting 4297b85a appears to work fine on previous version of Mac OS X as well. This change will not affect Windows (DirectWrite) and FreeType font engines since they both return integer values for that. Reviewed-by: Eskil
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-082-18/+39
| |\ \ | | |/ | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Use more numerically robust algorithm to compute QBezier::pointAt().
| | * Use more numerically robust algorithm to compute QBezier::pointAt().Samuel Rødal2011-07-082-18/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QBezier::pointAt() could potentially return values outside the bezier's bounds, even when the bezier was a straight horizontal line. For example, with y = 0.5, it would produce y=0.5 or y=0.49999999999999 for different values of t, which when rounded cause jittering in a QML PathView. Task-number: QTBUG-17007 Task-number: QTBUG-18133 Reviewed-by: Kim
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-073-11/+10
| |\ \ | | |/ | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Fix editable combobox style on Mac Revert 344a4dcfe and part of 93bce787 Fix raster subpixel positioning in Lion
| | * Fix editable combobox style on MacJiang Jiang2011-07-071-5/+5
| | | | | | | | | | | | Reviewed-by: Jens Bache-Wiig
| | * Revert 344a4dcfe and part of 93bce787Jiang Jiang2011-07-072-6/+5
| | | | | | | | | | | | | | | | | | Due to subpixel grid change, these changes are no longer needed. Reviewed-by: Eskil
| | * Fix raster subpixel positioning in LionJiang Jiang2011-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | In Lion, the x position returned by CTFontGetBoundingRectsForGlyphs can be fractional, we need to round().truncate() it as we did in QTextureGlyphCache to save the baseLineX. Reviewed-by: Eskil
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-0713938-1043512/+2123609
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (105 commits) Add Q_DECL_CONSTEXPR Use Q_DECL_CONSTEXPR in QFlags Fix QScopedPointerarray default constructor QS60Style: QMessageBox theme background is incorrect Adding "hkscs_2004" to the codec alias table Adding Kazakh entry to the codec alias table Update changelog with Accessibility fixes. On symbian QMessageBox icon is on different side than in native dialog Fix horizontal center alignment with trailing space Regression: QS60Style - All standardIcons are drawn as "small icons" Changelog: Add mention of qmlplugindump. Flicking behaviour of ListView/GridView SnapOnItem is inconsistent Skip flick velocity test on Mac. Doc: Fixing typo QS60Style: provide more standard icons changelog Compile with DEBUG_FONTENGINE define minor optimization remove the old compatibility code make QFontEngineQPF1 work even without mmap(2) support ...
| | * Merge remote branch 'mainline/4.8'Jiang Jiang2011-07-0713938-1043512/+2123609
| | |\ | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.8.0
* | | \ Merge remote branch 'mainline/4.8' into stagingJiang Jiang2011-07-0813949-1043539/+2123710
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Conflicts: dist/changes-4.8.0
| * | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-07-073-2/+20
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Update the Window title when closing the last tab. On symbian QMessageBox does not look like native dialog Fix bidi reordering when part of text is rendered by fallback font
| | * \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-073-2/+20
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-07-071-0/+1
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update the Window title when closing the last tab.
| | | | * | | Update the Window title when closing the last tab.Casper van Donderen2011-07-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-20243 Reviewed-By: Kevin Wright
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-07-061-1/+13
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix bidi reordering when part of text is rendered by fallback font
| | | | * | | | Fix bidi reordering when part of text is rendered by fallback fontEskil Abrahamsen Blomfeldt2011-07-061-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the fallback font is used for part of a RTL text, we need to position the different text items accordingly, subtracting the advance instead of adding it. Task-number: QTBUG-17117 Done-with: Lars
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-07-061-1/+6
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: On symbian QMessageBox does not look like native dialog
| | | | * | | | | On symbian QMessageBox does not look like native dialogSami Merila2011-07-061-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If API QMessageBox::setInformativeText() is used to set informative text to the messagebox, the text is added to the "icon column", which makes the messagebox look really weird. Use layoutDirection() and add informative text to the same column where other text elements are added. Task-number: QTBUG-9924 Reviewed-by: Tomi Vihria
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-07-072-9/+30
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Fix QProcess emitting two started signals on X11
| | * | | | | | | | Fix QProcess emitting two started signals on X11Christian Strømme2011-07-072-9/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On X11 QProcess would emit two started signals when calling QProcess::waitForStarted(). We should expect that the private implementation of waitForStarted() should emit the started signal and return true or false appropriately. Task-number: QTBUG-7039 Change-Id: I3d381399ab7a39bf57db03a110fa6747a4fc6a24 Reviewed-on: http://codereview.qt.nokia.com/331 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com> (cherry picked from commit 883b120d2f39c532cdd1a98d962af83be5adc4bd)
| * | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-07-079-16/+51
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: HTTP internals: continue gzip decompression if buffer fills exactly HTTP internals: do not discard data if not receiving gzip end marker Support partial input mode - documentation update Add a null check for the backend in QNetworkReplyImpl. Support partial input mode Fixes switching runtime graphics system when the maximized window is shown or hidden.
| | * | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-069-16/+51
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-07-054-6/+16
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: HTTP internals: continue gzip decompression if buffer fills exactly HTTP internals: do not discard data if not receiving gzip end marker Add a null check for the backend in QNetworkReplyImpl.
| | | | * | | | | HTTP internals: continue gzip decompression if buffer fills exactlyPeter Hartmann2011-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Markus Goetz Reviewed-by: Prasanth Ullattil Task-number: QTBUG-12908
| | | | * | | | | HTTP internals: do not discard data if not receiving gzip end markerPeter Hartmann2011-07-053-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some servers send gzip data without the gzip end markers. In that case, we should deliver all content and tear down the gzip data structures. Reviewed-by: Markus Goetz Patch-by: Tor Arne Vestbø and Peter Hartmann Task-number: QTBUG-16022
| | | | * | | | | Add a null check for the backend in QNetworkReplyImpl.Jocelyn Turcotte2011-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a blurry attempt to fix a crash happening during bearer session loss/recovery. Reviewed-by: Markus Goetz
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-07-054-10/+27
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Support partial input mode - documentation update Support partial input mode
| | | | * | | | | Support partial input mode - documentation updateSami Merila2011-07-051-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the documentation related to the QApplication attribute. Task-number: QTBUG-16572 Reviewed-by: Tomi Vihria
| | | | * | | | | Support partial input modeSami Merila2011-07-053-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Connect the internal private API to the QApplication public attribute. This allows the enabling/disabling of the splitview functionality from apps without any hacks. Task-number: QTBUG-16572 Reviewed-by: Tomi Vihria
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-07-051-0/+8
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes switching runtime graphics system when the maximized window is shown or hidden.