summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.8-upstream' into master-waterWater-Team2011-07-073-2/+76
|\
| * Fix QProcess emitting two started signals on X11Christian Strømme2011-07-071-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * Use Q_DECL_CONSTEXPR in QFlagsOlivier Goffart2011-07-061-0/+28
| | | | | | | | | | | | | | | | Change-Id: I851e0b1c3f80a7b33a38cb1ab2665dc0f3c73adc Reviewed-on: http://codereview.qt.nokia.com/1248 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> (cherry picked from commit c0c6dd2b022cfd667f32b8a48bcac86ac07d3880)
| * Fix QScopedPointerarray default constructorOlivier Goffart2011-07-051-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the compiler cannod find the template argument if there is no argument passed to the constructor, this effectively means there is no default constructor. Add a default constructor Task-number: QTBUG-20256 Change-Id: I310d5e1f3f94a8fe69fd3a5c46f2f51bca60facd Reviewed-on: http://codereview.qt.nokia.com/1165 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> (cherry picked from commit d789e40c58c1ce8441d3bb4d6ca8d01fe02ad1a7)
* | Implement text interface for QLineEdit.Frederik Gladhorn2011-07-061-1/+54
| | | | | | | | | | | | | | Add boundary helper functions to the QAccessibleTextInterface. Move LineEdit over to use QTextBoundaryFinder. Reviewed-by: Jan-Arve
* | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-054-5/+153
|\ \ | |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-07-054-5/+153
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: Flicking behaviour of ListView/GridView SnapOnItem is inconsistent Skip flick velocity test on Mac. Try again to fix flickable velocity on Mac. Try to fix Mac CI test failure qmlplugindump: Fix dumping with -path on Mac. qmlplugindump: Improve error message for misbehaving plugin components. Flickable is too sensitive. Reduce timing dependancy in flickable test Velocities reported by Flickable in onFlickStarted can be 0 qmldump: Fix export comparison. QmlInspector: Some code cleanups QmlInspector: Some cleanup in the Color Picker tool QmlInspector: Unified mouse and keyboard event handling QmlInspector: Removed private header postfix and Qt namespace QmlInspector: Share code between QGV/SG based QML debugging qmlplugindump: For extended types, remove exports of the base object. qmlplugindump: Build debug version if possible. QDeclarativeDebug: Add code coverage information
| | * Flicking behaviour of ListView/GridView SnapOnItem is inconsistentMartin Jones2011-07-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the response of the views when SnapOneItem/Row is enabled. In this case it is best to be much more reactive to the user input since even a small movement in a particular direction indicates a change to the next/previous item. Change-Id: I6a8eb689c3b12cdc67f24106032e36bba82d2846 Task-number: QTBUG-19874 Reviewed-by: Bea Lam
| | * Skip flick velocity test on Mac.Martin Jones2011-07-031-0/+4
| | | | | | | | | | | | | | | | | | Change-Id: Ib995961d7b1a939e5feb86d72a82408d1ceebe88 Task-number: QTBUG-19676 Reviewed-by: Bea Lam
| | * Try again to fix flickable velocity on Mac.Martin Jones2011-06-301-0/+1
| | | | | | | | | | | | | | | | | | Change-Id: Id2693a69739886f9a171f3f6438a5404dff8e901 Task-number: QTBUG-19676 Reviewed-by: Bea Lam
| | * Try to fix Mac CI test failureMartin Jones2011-06-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Try slowing down the flick to give the slow CI machine a better chance of success. Change-Id: Id61473e73a38bb888b9bee47cffb913c936155b9 Task-number: QTBUG-19676 Reviewed-by: Bea Lam
| | * Reduce timing dependancy in flickable testMartin Jones2011-06-292-49/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | Interval of 10ms between synthesized flick move events is too prone to timing difference on CI platforms. Change-Id: Id5da794a7294868c8f5e544fa71edeec967e31ca Task-number: QTBUG-19676 Reviewed-by: Bea Lam
| | * Velocities reported by Flickable in onFlickStarted can be 0Martin Jones2011-06-281-0/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure the smoothed velocity is set at the start of the flick. Ensure that the smoothed velocity animation isn't restarted unless there is new valid data. Change-Id: I00f8bbf1fe91faeea752b093c4658ad0f53ad06d Task-number: QTBUG-19676 Reviewed-by: Bea Lam
| | * QDeclarativeDebug: Add code coverage informationKai Koehne2011-06-221-0/+101
| | | | | | | | | | | | | | | | | | | | | Add messages to track the lines of JavaScript that are executed. Patch done by Janne Virranmaki <ext-janne.1.virranmaki@nokia.com> Reviewed-by: kkoehne
* | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-0458-109/+174
|\ \ \ | |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵v4.8.0-betaQt Continuous Integration System2011-07-0320-48/+48
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Fixing typo
| | * | Doc: Fixing typoSergio Ahumada2011-07-0220-48/+48
| | | |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into ↵Qt Continuous Integration System2011-07-026-6/+9
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: (41 commits) Make sure the declarative plugin of QtWebKit is build once. Make sure JavaScriptCore is build once. Updated WebKit to a52dbae362a295e0adfb7ee4fdc21734ae4b7b45 2011-05-23 Matthew Delaney <mdelaney@apple.com> Fix headers generation for QtWebKit. 2011-06-28 Alexis Menard <alexis.menard@openbossa.org> Skip QtWebKit as it leaks symbols and add a namespace exception for QtScript. Fix the auto-tests of QtWebKit. 2011-06-27 Joe Wild <joseph.wild@nokia.com> 2011-06-28 Alexis Menard <alexis.menard@openbossa.org> Updated WebKit to d30a30ac4faadcb8b2e282e343c921f919fbca9b Updated WebKit to 631751dee41f81af4daa7821f98b1ce8667c4d90 Updated WebKit to 0de6fbe7d7714e4d2520f84a7d7e0c5ed9a55114 Make QtWebKit actually works when linked to an application. Attempt to get Symbian building with SQLite. Make the headers test pass by including QtGui/QColor instead of QColor. Fix the in-tree build by not letting qtbase.pri add explicitlib or staticlib to CONFIG. Hack RenderBlock's continuation() and setContinuation() for RVCT 2.x. Use WTF::notFound instead of -1 to check for Vector::find() errors. The autotests don't even build on Symbian, skip them for now. ...
| | * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-teamQt Continuous Integration System2011-06-296-6/+9
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team: (39 commits) Updated WebKit to a52dbae362a295e0adfb7ee4fdc21734ae4b7b45 2011-05-23 Matthew Delaney <mdelaney@apple.com> Fix headers generation for QtWebKit. 2011-06-28 Alexis Menard <alexis.menard@openbossa.org> Skip QtWebKit as it leaks symbols and add a namespace exception for QtScript. Fix the auto-tests of QtWebKit. 2011-06-27 Joe Wild <joseph.wild@nokia.com> 2011-06-28 Alexis Menard <alexis.menard@openbossa.org> Updated WebKit to d30a30ac4faadcb8b2e282e343c921f919fbca9b Updated WebKit to 631751dee41f81af4daa7821f98b1ce8667c4d90 Updated WebKit to 0de6fbe7d7714e4d2520f84a7d7e0c5ed9a55114 Make QtWebKit actually works when linked to an application. Attempt to get Symbian building with SQLite. Make the headers test pass by including QtGui/QColor instead of QColor. Fix the in-tree build by not letting qtbase.pri add explicitlib or staticlib to CONFIG. Hack RenderBlock's continuation() and setContinuation() for RVCT 2.x. Use WTF::notFound instead of -1 to check for Vector::find() errors. The autotests don't even build on Symbian, skip them for now. Hack SystemTimeWin.cpp to build on MSVC2005. Make Float32Array and Int16Array build on RVCT 2.x. ...
| | | * | Skip QtWebKit as it leaks symbols and add a namespace exception for QtScript.Alexis Menard2011-06-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The library leaks symbols mostly due to gcc bugs. We can't really test WebKit. Reviewed-by: Thiago Macieira
| | | * | Fix the auto-tests of QtWebKit.Alexis Menard2011-06-285-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The source tree of WebKit was reorganized. The pro files needs to be updated. Reviewed-by:Andreas Kling
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-07-0228-50/+50
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: changelog Compile with DEBUG_FONTENGINE define minor optimization remove the old compatibility code make QFontEngineQPF1 work even without mmap(2) support Doc: Fixing typo
| | * | | | Doc: Fixing typoSergio Ahumada2011-06-3028-50/+50
| | | | | |
| * | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-07-021-0/+40
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Re-apply licenseheader text in source files for qt4.7 Fix QWidget::palettePropagation2() autotest on Symbian (part 2) Fix QWidget::palettePropagation2() autotest on Symbian QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5 Fix text color in some cases of QML and QStaticText Added qmlshadersplugin to Symbian s60installs.pro-file. Fix KERN-EXEC 0 errors in symbian bearer plugin
| | * \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-011-0/+40
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/s60installs.pro
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-06-291-0/+40
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix text color in some cases of QML and QStaticText
| | | | * | | | Fix text color in some cases of QML and QStaticTextEskil Abrahamsen Blomfeldt2011-06-291-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts 518c2a58ed6fdfd7449cb4476aa8ea0d32ad16e3 which caused a regression. When writing systems are mixed and an underline is set on the font, QPainter will set a pen with the current color and a new width on itself before drawing the decoration. This would cause the recorder in QStaticText to mark the pen as dirty, saving the current pen color in all subsequent text items. The effect was e.g. that in QML the cached color would override the current one, making it impossible to change the color on the text without forcing a relayout somehow. The right fix is to only mark the pen as dirty when its color actually changes. Task-number: QTBUG-20159 Reviewed-by: Jiang Jiang
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-07-014-0/+166
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Cocoa: QFileDialog: fix filename filter not applied correctly Fix typo in docs: occurred. Cocoa: fix qtabwidget auto test failure Cocoa: fix qwidget auto test failures Cocoa: Fix qgraphicsproxywidget auto test Use Q_SLOTS instead of slots in public headers. Fix a11y crash: dock doesn't always have a widget. Fix typo in comment. Mac: respect WA_ShowWithoutActivating flag Remove misleading and incorrect information from dropMimeData docs. Provide the resetInternalData slot to cleanly reset data in proxy subclasses. Mac: switch raster off as default paint engine
| * \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-07-013-5/+27
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Symbian socket engine: remove remaining todo comments Symbian: tune network autotest heap size so they can run on emulator Fix invalid read in QUrl::removeAllEncodedQueryItems Push the data together with the error in the synchronous case.
| | * | | | | | | Symbian: tune network autotest heap size so they can run on emulatorShane Kearns2011-06-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Heap sizes were increased during development due to OOM failures, but the tests cannot be launched on emulator because of the address space problem (symbian emulator known issue) As the OOM failures were caused by unlimited buffering in the proxy socket engines (fixed by c4727a85eed57a4db698326a1bed4aa75b6e5284) the tests work on both emulator and hardware with the new buffer size. Task-number: QTBUG-18221 Reviewed-by: Markus Goetz
| | * | | | | | | Fix invalid read in QUrl::removeAllEncodedQueryItemsOlivier Goffart2011-06-281-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The remove will detach the string making the query pointer invalid. Note: the "test3" case is commented out because it does not remove the & at the end, and i do not want to enforce this behaviour in the test Task-number: QTBUG-20065 Change-Id: I195c5c3b468f46c797c7c4f8075303f2b1f4724c Reviewed-on: http://codereview.qt.nokia.com/822 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> (cherry picked from commit 2dd90a27a82289a5088b929c3bd27c1fd05967f6) Conflicts: tests/auto/qurl/tst_qurl.cpp
* | | | | | | | | Add DBus VirtualObject to handle multiple paths.Frederik Gladhorn2011-07-042-2/+271
| |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a virtual object is registered with the SubPath option it will handle all dbus calls to itself and all child paths. It needs to reimplement handleMessage for that purpose. Introspection needs to be implemented manually in the introspect function. Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-06-29138-950/+2919
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into ↵Qt Continuous Integration System2011-06-2842-716/+716
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging: Re-apply licenseheader text in source files for qt4.8
| | * | | | | | Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-06-2742-716/+716
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New files after previous license change round. Reviewed-by: Trust Me
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-06-273-1/+88
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Make it compile with openssl 1.0.0d, gcc 4.6 QStringBuilder: do not crash with null char* Fix event delevery order QSocketNotifier autotest - fix compile with MSVC
| | * | | | | | QStringBuilder: do not crash with null char*Olivier Goffart2011-06-271-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is supported by the others operator+ Change-Id: I9a1d1a0afb63acf32935948111d43ca6da370363 Reviewed-on: http://codereview.qt.nokia.com/764 Reviewed-by: hjk (cherry picked from commit 53a16752c257d2f4f99ecef2cde1580b817fc12a)
| | * | | | | | Fix event delevery orderOlivier Goffart2011-06-271-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some functions (such as QObject::moveToThread) did not keep the event ordered by priority. And because qUpperBound is used to add events, that mean new events would not be inserted in order. Task-number: QTBUG19637 Change-Id: I38eb9addb1cdd45b8566e000361ac6e5f1f2c2b8 Reviewed-on: http://codereview.qt.nokia.com/733 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> (cherry picked from commit 7eeabcf70db658bca847498f618a94a375c95f5f)
| | * | | | | | QSocketNotifier autotest - fix compile with MSVCShane Kearns2011-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Sergio Ahumada
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-06-272-0/+45
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Incorrect property name in QAccessibleAbstractSpinBox::setCurrentValue When asking for relations, don't crash on children that don't return an interface. Remove more inconsistencies with invisible. QAccessibleToolButton::text should return accessibleName if set. Remove stray semicolon. Do not expose text when echo mode is not Normal. Check validator when changing text using accessibility functions. Fix some issues introduced in df6713b8f55fc007796f40. Add tilde (both ~ and ~<userName>) expansion to QFileDialog on UNIX. Avoid bogus accessibility focus events from menus. Build fix for Mac OS 10.5 Avoided calling updateAccessibility() from updateMicroFocus if the item was hidden Notify a11y framework of FocusChanges for QGraphicsObject Call updateAccessibility on the QGraphicsObject in updateMicroFocus Fix updateAccessibility for QGraphicsObjects Make accessibility work on Windows with alien
| * | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-06-242-0/+73
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (28 commits) Use numeric virtual keyboard for all number entry modes. QTBUG-17776, reporting terminated threads as not running on Symbian Splitview - Auto-translation rules changed Support clipboard function on Symbian Added qmlshadersplugin to Symbian qt.iby-file. Workaround webkit deadlock on macos x Disable antialiasing for tiled image drawing. Ensure visibility of input widget in QML app when doing layout switch Def update for gui, openvg, and opengl. Revert "Def update." Fix trailing whitespace Remove unnecessary resizes during orientation change Revert "Symbian: Fix QFontInfo::pixelSize()" Improving warning messages in QVolatileImage. Proper naming for raster pixmap and paintengine on Symbian. Def update. Handle QVolatileImage-backed pixmaps optimally in drawPixmap(). Resizable graphicsview's background is drawn incorrectly in splitview Add inputcontext reset to orientation switch in Symbian QS60Style: QGroupBox is drawn as white box in upcoming Symbian release ...
| | * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-242-0/+73
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/image/qpixmap_raster_symbian.cpp src/gui/image/qpixmapdatafactory.cpp src/gui/painting/qgraphicssystem.cpp src/gui/styles/qs60style.cpp src/network/bearer/qnetworkconfigmanager_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtOpenGLu.def src/s60installs/bwins/QtOpenVGu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-06-205-23/+344
| | | |\ \ \ \ \
| | | * | | | | | Revert "Revert "Fix QNetworkConfigurationManager usage outside main thread ↵Shane Kearns2011-06-132-1/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | first"" This reverts commit daba0c0d588c55e3f1591ab8ce0ef0946d1447fd.
| * | | | | | | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-06-24168-309/+7064
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-06-231-0/+4
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add a function that returns the D-Bus local machine ID Add an SSE4.2 even simpler version of toLatin1
| | | * | | | | | | Add an SSE4.2 even simpler version of toLatin1Thiago Macieira2011-06-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the new PCMPESTRM instruction (Parallel CoMPare Explicit-length STRings with result in a Mask) which is added in SSE4.2 for facilitating string operations. The "compare ranges" mode allows us to search for characters outside the Latin 1 range and then use the SSE4.1 PBLENDVB instruction to replace those with question marks. Unlike previous SSE compare instructions, the PCMPxSTRx family allows us to operate on unsigned 16-bit values. This saves us another parallel add. Reviewed-By: Samuel Rødal
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-06-232-1/+2
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Skip boundry neutral characters in bidi itemization Update autotest case after toHtml change Proper fix for previous deallocation problem No need to destroy match pattern again Fix fontconfig usage in X11 font database Fix empty lines in Qt HTML when displayed in external browsers (again) Make it possible to set color of QStaticText with pixel size >= 64
| | | * | | | | | | Skip boundry neutral characters in bidi itemizationJiang Jiang2011-06-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to UAX #9, bidiItemize should act as if those characters don't exist. If we don't, dir and status.eor here may become QChar::DirBN, thus interfere the result of bidiItemize. Task-number: QTBUG-19949 Reviewed-by: Lars Knoll
| | | * | | | | | | Merge remote branch 'qt-mainline/4.8'aavit2011-06-2281-198/+1562
| | | |\ \ \ \ \ \ \