summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-202-9/+18
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Changes to the index page and second level pages linking to the index page. Use Ctrl rather than Alt for switching tabs in the demo browser Doc: fixing creator bugs, removing menus and textbox in the header Update Japanese translations Ukrainian translation updated qtconfig and qvfb internationalization fixes add full width characters to ending() in linguist QFileDialog::HideNameFilterDetails breaks Cocoa QFileDIalog filter qdoc: Changed id attribute to be a UUID. just build connman and networkmanager plugins on linux
| * QFileDialog::HideNameFilterDetails breaks Cocoa QFileDIalog filterRichard Moe Gustavsen2010-08-201-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | Using namefilters in the non-native file dialog is a bit broken by design, since it don't store the whole selected name filter, but only the filter with details stripped off (if this is specified). And it stores this data in gui widgets. And the native file dialog also suffers from this. At least this patch will pick the first matching name filter (with details) given a details-stripped version. Task-number: QTBUG-12870 Reviewed-by: cduclos
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-08-209-68/+104
| |\
| * | just build connman and networkmanager plugins on linuxLorn Potter2010-08-201-1/+1
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-2013-24/+467
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Introduce QtOpenGL module for Symbian.
| * | | Introduce QtOpenGL module for Symbian.Jani Hautakangas2010-08-2013-24/+467
| | |/ | |/| | | | | | | | | | Task-number: QT-2139 Reviewed-by: Gunnar Sletta
* | | Allow QML Quit buttons to work inside QtDemo.Alan Alpert2010-08-201-1/+1
|/ / | | | | | | Also changes the line documenting the quit signal on QDeclarativeEngine.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-201-39/+68
|\ \ | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Doing "import foo.qml" doesn't work in QML anymore Add info to Loader docs about receiving signals and key events
| * | Add info to Loader docs about receiving signals and key eventsBea Lam2010-08-201-39/+68
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-191-13/+13
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Ensure geometry of top-level widget accounts for S60 screen furniture
| * | Ensure geometry of top-level widget accounts for S60 screen furnitureGareth Stockwell2010-08-191-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the S60 screen furniture has already been constructed before QWidgetPrivate::show_sys() is called on a top-level widget which has Qt::WindowMaximized set (e.g. due to a showMaximized() call), its geometry is set to the full screen extent, including the regions covered by the status bar and CBA. This patch ensures that calculation of the widget geometry always takes into account the screen furniture. Task-number: QTBUG-12605 Reviewed-by: Jason Barron
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-191-1/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fatal crash on solaris 64 bit qdoc: Added more elements to qt.pageindex doc: Removed comment about automatic inclusion of 3rd party library. qdoc3: Added more pagewords & elements to the search index. qdoc3: Added more pagewords & elements to the search index.
| * | Fatal crash on solaris 64 bitCarlos Manuel Duclos Vergara2010-08-191-1/+2
| |/ | | | | | | | | | | | | | | | | We use a dummy variable for a function call, and that variable is causing a data misalignment. Changing the type to long fixes the issue. According to Denis it is ok to change this for all cases. Task-number: QTBUG-12928 Reviewed-by: Denis Dzyubenko
* | Fixes a regression preventing loading images without extensionsThierry Bastian2010-08-191-3/+0
| | | | | | | | | | Task-number: QTBUG-12560 Reviewed-by: gabi
* | Made GL pixmap backend respect Qt::NoOpaqueDetection flag..Samuel Rødal2010-08-191-2/+4
| | | | | | | | | | | | | | We don't want to do the opaque image scan when the Qt::NoOpaqueDetection flag is set. Reviewed-by: Trond
* | QTextCodec: fix wodring of a commentOlivier Goffart2010-08-191-2/+4
| |
* | QDeclarativeImageProvider: Do not keep the global declarative mutex locked ↵Olivier Goffart2010-08-193-8/+13
|/ | | | | | | | | | | | | | | | when processing. The point is to be able to process images in a thread. If the mutex is locked, this is useless. Use case is a slow QDeclarativeImageProvider that generates thumbmails from large files. Even with the asynchronous attribute set to true, the gui thread would be blocked by the mutex. By using QSharedPointer, I also fix the leak of the providers (which were not deleted) Reviewed-by: Martin Jones
* cleanup and remove __FUNCTION__, which breaks build on solarisLorn Potter2010-08-192-25/+2
| | | | Task-number: QTBUG-12904
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-182-26/+30
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: use intel linker and librarian with icc create missing output directories for substituted files fix shadow builds with scratchbox QMake/Win32/MinGW: Fix ar script generating with absolute paths Crash in QWidgetPrivate::init on QApplication::quit() using a modal dialog on Mac Crash in QX11PaintEngine::drawPixmap Revert "Fix the rendering of lines with the X11 paint engine" Revert "Outline / fill inconsistency in X11 paint engine."
| * Crash in QWidgetPrivate::init on QApplication::quit() using a modal dialog ↵Carlos Manuel Duclos Vergara2010-08-181-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | on Mac The problem was the order of deletion in the destructor. To autotest this I create an application, start a modal dialog and then quit the application. The fix was contributed by a customer. Task-number: QTBUG-12673 Reviewed-by: Olivier Goffart
| * Crash in QX11PaintEngine::drawPixmapCarlos Manuel Duclos Vergara2010-08-181-0/+2
| | | | | | | | | | | | | | | | | | | | We receive a pixmap as a const reference and then we convert it to an X11 pixmap. This conversion could fail for many reasons, however we were not looking at the result of this conversion. This patch was contributed by Christoph Feck from KDE. Task-number: QTBUG-12826 Reviewed-by: Samuel
| * Revert "Fix the rendering of lines with the X11 paint engine"Samuel Rødal2010-08-181-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ebbab30af417dfbf3df47dec15c0e2f8d6a30fa6, which broke fill / outline consistency, and when trying to fix that by rounding the fill the same way that broke rendering in Creator. Unfortunately the X11 paint engine is too sensitive to changes, there have already been tons of patches to make it as consistent as possible. It's simply not possible to get the same rounding for both fill and outlines and at the same time have consistency between fill and outline (no holes or fill outside the outline), while using the integer based Xlib rendering API. Hopefully in 4.8 we'll switch to raster and the X11 paint engine will be a legacy. Reviewed-by: Trond
| * Revert "Outline / fill inconsistency in X11 paint engine."Samuel Rødal2010-08-181-4/+4
| | | | | | | | | | | | This reverts commit ff405f5623d7ed18c881c097368e3e9afd2e9443. Reviewed-by: Trond
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-181-0/+4
|\ \ | |/ |/| | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: respect the layout direction in the default text option
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-181-0/+4
| |\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: respect the layout direction in the default text option
| | * respect the layout direction in the default text optionLars Knoll2010-08-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression against 4.6 where setting the default layout direction for rich text got ignored Task-number: QT-3566 Reviewed-by: Jiang Jiang
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-186-50/+55
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Fixing overlapping text in header list qdoc: Reorganized the QML elements table to be a dictionary... unbreak qmake autotest Update Polish translations Cocoa: revert parts of cc6dc0aeefde881a95f5fea2b26f2f3d7bdc6e15 Cocoa, Autotest: disable autotest that was added a bit premature make error messages consistent Add tests/benchmarks/README qgrayraster: Remove unnecessary indirection in QT_FT_Outline_Decompose Cocoa: add autotest to be more safe regarding child window stacking Fix compilation: QT_NO_TEXTSTREAM exclude QtXmlPatterns from the completeness assessment fix QMAKE_SUBSTITUTES with shadow builds Outline / fill inconsistency in X11 paint engine. Cocoa: parent windows shows on screen when they should be hidden Prevented Xorg crash in qtdemo when running corkboards example.
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-186-50/+55
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Cocoa: revert parts of cc6dc0aeefde881a95f5fea2b26f2f3d7bdc6e15 Cocoa, Autotest: disable autotest that was added a bit premature make error messages consistent Add tests/benchmarks/README qgrayraster: Remove unnecessary indirection in QT_FT_Outline_Decompose Cocoa: add autotest to be more safe regarding child window stacking Fix compilation: QT_NO_TEXTSTREAM exclude QtXmlPatterns from the completeness assessment fix QMAKE_SUBSTITUTES with shadow builds Outline / fill inconsistency in X11 paint engine. Cocoa: parent windows shows on screen when they should be hidden Prevented Xorg crash in qtdemo when running corkboards example.
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-186-50/+55
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Cocoa: revert parts of cc6dc0aeefde881a95f5fea2b26f2f3d7bdc6e15 Cocoa, Autotest: disable autotest that was added a bit premature make error messages consistent Add tests/benchmarks/README qgrayraster: Remove unnecessary indirection in QT_FT_Outline_Decompose Cocoa: add autotest to be more safe regarding child window stacking Fix compilation: QT_NO_TEXTSTREAM exclude QtXmlPatterns from the completeness assessment fix QMAKE_SUBSTITUTES with shadow builds Outline / fill inconsistency in X11 paint engine. Cocoa: parent windows shows on screen when they should be hidden Prevented Xorg crash in qtdemo when running corkboards example.
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-176-50/+55
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Cocoa: revert parts of cc6dc0aeefde881a95f5fea2b26f2f3d7bdc6e15 Cocoa, Autotest: disable autotest that was added a bit premature make error messages consistent Add tests/benchmarks/README qgrayraster: Remove unnecessary indirection in QT_FT_Outline_Decompose Cocoa: add autotest to be more safe regarding child window stacking Fix compilation: QT_NO_TEXTSTREAM exclude QtXmlPatterns from the completeness assessment fix QMAKE_SUBSTITUTES with shadow builds Outline / fill inconsistency in X11 paint engine. Cocoa: parent windows shows on screen when they should be hidden Prevented Xorg crash in qtdemo when running corkboards example.
| | | | * Cocoa: revert parts of cc6dc0aeefde881a95f5fea2b26f2f3d7bdc6e15Richard Moe Gustavsen2010-08-171-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason is that we tried to fix the stacking order of child windows while we fixed a crash. But the patch turned out to break an auto-test Reviewed-by: prasanth
| | | | * qgrayraster: Remove unnecessary indirection in QT_FT_Outline_DecomposeAndreas Kling2010-08-171-35/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since this function is only used inside qgrayraster.c, we can call the gray_* functions directly instead of going through function pointers. This allows inlining trivial methods like gray_line_to() et al. Reviewed-by: Samuel Rødal
| | | | * Fix compilation: QT_NO_TEXTSTREAMTasuku Suzuki2010-08-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2450 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-174-15/+48
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Outline / fill inconsistency in X11 paint engine. Cocoa: parent windows shows on screen when they should be hidden Prevented Xorg crash in qtdemo when running corkboards example.
| | | | | * Outline / fill inconsistency in X11 paint engine.Samuel Rødal2010-08-171-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change ebbab30af417dfbf3df47dec15c0e2f8d6a30fa6 broke outline / fill consistency in the X11 engine. Since the positioning of lines is more important we'll round the fill coordinates the same way. The bug was visible in the filltest.qps arthur test. Reviewed-by: Gunnar Sletta
| | | | | * Cocoa: parent windows shows on screen when they should be hiddenRichard Moe Gustavsen2010-08-171-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason is the cocoa method that adds a window as a child of another, it ends up showing both the parent and the child window regardless. And this could in some cases also cause a crash. So we therefore need to be careful when calling that function, and be sure that the parent is actually visible. In addition, addChildWindow reset the stacking level of the child window, and made e.g. normal child windows pop in front of tool child windows. This could easily be seen in e.g. Designer. Task-number: QTBUG-12866 Reviewed-by: prasanth
| | | | | * Prevented Xorg crash in qtdemo when running corkboards example.Samuel Rødal2010-08-172-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash happens in the Nvidia driver in glXReleaseTexImageEXT when scrolling the corkboard using the mouse. To work around it we detect the Nvidia driver versions where this is known to be a problem and skip using the texture from pixmap extension in those cases. Task-number: QTBUG-12914 Reviewed-by: Trond
* | | | | | Ensure native window is considered invisible when it gets destroyedGareth Stockwell2010-08-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The lifetime of the backing store depends, on Symbian, on the visibility of the native windows which are rendering from it. Specifically, once all such windows (i.e. the TLW window and those of any native widget descendents) have become invisible, the backing store is deleted. During re-parenting of a visible native child widget from parent1 to parent2, the following events occur: 1. QWidget::hide() is called on the child 2. The child widget's native control is deleted 3. A new native control is created, with its parent set as parent2->window()->effectiveWinId() Because there is no yield to the event loop between (1) and (2), the application does not receive a 'window hidden' notification as a result of the call to hide(). This means that the child widget is not removed from the list of visible widgets held in the backing store of parent1->window(). This patch ensures that the child is removed from this list during between steps (1) and (2). Task-number: QTBUG-12406 Task-number: QTBUG-12817 Reviewed-by: Jason Barron
* | | | | | Refactored handling of window visibility events on SymbianGareth Stockwell2010-08-182-26/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12817 Reviewed-by: Jason Barron
* | | | | | Replaced backing store reference count with list of visible widgetsGareth Stockwell2010-08-183-31/+58
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the following sequence: 1. Widget is hidden 2. Widget partially revealed 3. Widget fully revealed resulted in the reference count of the backing store owned by the widget's window() being incremented twice. This patch replaces the simple reference count with a QSet which stores pointers to the native widgets which are descendents of the backing store owner, and which are currently visible. The sequence above therefore results in just a single insertion at step (2), with step (3) having no effect on the backing store. The QRefCountedWidgetBackingStore class has been renamed QWidgetBackingStoreTracker to better reflect its purpose. Task-number: QTBUG-12800 Task-number: QTBUG-12817 Reviewed-by: Jason Barron
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-181-5/+13
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Repaint TextInput when password character changes in password mode
| * | | | Repaint TextInput when password character changes in password modeJoona Petrell2010-08-171-5/+13
| | |/ / | |/| | | | | | | | | | | | | | Task-number: QTBUG-12838 Reviewed-by: Martin Jones
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-179-13/+297
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix the blending of ARGB_PM image when using palignr to load the data Adjusted define styling Fixes QWS window decoration offset issues tst_QDataStream::stream_QPixmap: actualy test QPixmap. Keyboard navigation regression in QTreeView Implement the general blending of ARGB32_pm with SSSE3 QtDeclarative debugging: Add an option not to stream the properties of an object.
| * | | Fix the blending of ARGB_PM image when using palignr to load the dataBenjamin Poulain2010-08-171-15/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The data loaded for the first were incorrect because the offset was incorrect. The correct offset should be up to the alignment point. Instead of trying to load a temporary array, we just move one vector further since we know reading there is always safe. Reviewed-by: Andreas Kling
| * | | Adjusted define stylingDonald Carr2010-08-171-3/+1
| | | | | | | | | | | | | | | | | | | | Adjusted multi-line define to single conjugated define in order to conform to the rest of the modified file.
| * | | Fixes QWS window decoration offset issuesUwe Rathmann2010-08-172-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using OpenGL ES in conjunction with Qt/Embedded, Q_BACKINGSTORE_SUBSURFACES is defined and the subsequent code path shared between this define and QWS defines results in window decoration offset errors. Merge-request: 714 Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-177-10/+295
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: tst_QDataStream::stream_QPixmap: actualy test QPixmap. Keyboard navigation regression in QTreeView Implement the general blending of ARGB32_pm with SSSE3 QtDeclarative debugging: Add an option not to stream the properties of an object.
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-177-10/+295
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Keyboard navigation regression in QTreeView Implement the general blending of ARGB32_pm with SSSE3 QtDeclarative debugging: Add an option not to stream the properties of an object.
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-167-10/+295
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Keyboard navigation regression in QTreeView Implement the general blending of ARGB32_pm with SSSE3 QtDeclarative debugging: Add an option not to stream the properties of an object.
| | | | * Keyboard navigation regression in QTreeViewGabriel de Dietrich2010-08-161-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ammends commit 8da7252de0badb818302763cbe62c38ad699f1f3 Auto-test included. Reviewed-by: Olivier Task-number: QTBUG-11466