profile/ivi/qtbase.git
13 years agoSquashed commit of changes from the 4.8-temp branch.
David Boddie [Wed, 11 May 2011 15:35:46 +0000 (17:35 +0200)]
Squashed commit of changes from the 4.8-temp branch.

13 years agoSquashed commit of the changes from the mobile-examples repository
David Boddie [Wed, 27 Apr 2011 17:16:41 +0000 (19:16 +0200)]
Squashed commit of the changes from the mobile-examples repository
(4.7-generated-declarative branch).

13 years agoEnablers for TextInput
Eskil Abrahamsen Blomfeldt [Mon, 9 May 2011 07:07:02 +0000 (09:07 +0200)]
Enablers for TextInput

In order to use the scene graph text node in TextInput, we
need enablers. Most of this is to enable selections,
which in turn means we need to be able to extract a certain
set of glyphs from a QTextLine.

13 years agoTrack Wayland changes
Paul Olav Tvete [Mon, 23 May 2011 10:29:54 +0000 (12:29 +0200)]
Track Wayland changes

The wl_display_get_xxxx_visual() functions have been removed, and
are replaced by a compositor event.

Reviewed-by: Samuel
13 years agoAdd task numbers for disabled autotests
Jason McDonald [Mon, 23 May 2011 07:19:55 +0000 (17:19 +1000)]
Add task numbers for disabled autotests

Change-Id: I830cdbf60ad1edf554b19cd7e6fdbd459f3e160f
Reviewed-by: Trust Me
13 years agoadd qmltestcase.prf for QtQuickTest
Charles Yin [Sat, 21 May 2011 13:50:14 +0000 (23:50 +1000)]
add qmltestcase.prf for QtQuickTest

so that 'CONFIG += qmltestcase' works

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Qt Continuous Integration System [Fri, 20 May 2011 12:04:01 +0000 (22:04 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Fix inconsistency between Qt and ICU in Shift-JIS codec with regards to ASCII range

13 years agoFix inconsistency between Qt and ICU in Shift-JIS codec with regards to ASCII range
Simon Hausmann [Mon, 16 May 2011 12:04:31 +0000 (14:04 +0200)]
Fix inconsistency between Qt and ICU in Shift-JIS codec with regards to ASCII range

Qt's Shift-JIS codec maps the characters 0x5c and 0x7e to unicode yen (0x5a)
and unicode overline (0x203e). ICU and (as it turns out) Symbian's native
Shift-JIS codec preserve 0x5c and 0x7e when converting to Unicode.

Qt's behaviour creates a problem when loading japanese web sites that are
encoded in Shift-JIS. When they reference external JavaScript files, those tend
to inherit the current page encoding (unless the character set is explicitly
specified). Consequently JavaScript tends to contain regular expressions (as a
built-in feature of the language), which in turn uses backslashes for escape
sequences. Therefore it is crucial that the encodings used to decode the script
preserve the ASCII range, i.e. do not convert 0x5c (ascii backslash) to
something else.

This patch corrects the behaviour of Qt's Shift-JIS codec to leave all
characters < 0x80 unaltered in the process of conversion to and from
Unicode.

Task: QTBUG-19335

Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
(cherry picked from commit 8e321cd869da7ff1cf0168da41aa0246b44867cc)

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Qt Continuous Integration System [Fri, 20 May 2011 10:36:27 +0000 (20:36 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  add test case for ipv6 url parsing

13 years agoadd test case for ipv6 url parsing
shiroki [Fri, 20 May 2011 08:38:12 +0000 (10:38 +0200)]
add test case for ipv6 url parsing

Reviewed-by: Thiago
(cherry picked from commit fd043eb78212de5935bc101624818070e1b4fb1b)

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Qt Continuous Integration System [Fri, 20 May 2011 09:18:56 +0000 (19:18 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  tst_qhostinfo: Fix IPv6 lookup detection on Windows.
  Fix incorrect hardware address on systems without getifaddrs()
  Make QHostAddress.toString() follow RFC-5952 for IPv6 address format.

13 years agotst_qhostinfo: Fix IPv6 lookup detection on Windows.
Martin Petersson [Fri, 20 May 2011 08:04:18 +0000 (10:04 +0200)]
tst_qhostinfo: Fix IPv6 lookup detection on Windows.

Moved the QTcpServer test to init winsock before we use getaddrinfo.

Reviewed-by: Shane Kearns
(cherry picked from commit 0ccf01368adcabbb25958a55976083f72116a2d5)

13 years agoFix incorrect hardware address on systems without getifaddrs()
Craig Scott [Wed, 11 May 2011 06:51:28 +0000 (16:51 +1000)]
Fix incorrect hardware address on systems without getifaddrs()

On unix systems for which QT_NO_GETIFADDRS is defined, the way that the
hardware address field is extracted from the result of a call to
qt_safe_ioctl() is incorrect. The address of the ifreq.ifr_addr struct
is taken rather than the appropriate member within that struct, sa_data,
resulting in a memory offset and subsequently the hardware address has
garbage in the first two of six fields. This commit modifies the code
to pass the sa_data member instead of the address of the struct as a
whole.

Task-number: QTBUG-19165
Merge-request: 2614
Reviewed-by: Martin Petersson
(cherry picked from commit 004ad12669ef696eeba70fd57d1eb0c67c806d1d)

13 years agoMake QHostAddress.toString() follow RFC-5952 for IPv6 address format.
Martin Petersson [Fri, 6 May 2011 11:00:53 +0000 (13:00 +0200)]
Make QHostAddress.toString() follow RFC-5952 for IPv6 address format.

Task-number: QTBUG-18426
Reviewed-by: Peter Hartmann
(cherry picked from commit ebc134db484eee31491836b619aad1ee86e3070e)

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Qt Continuous Integration System [Fri, 20 May 2011 08:21:33 +0000 (18:21 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Designer: Extend container extension.

13 years agoDesigner: Extend container extension.
Friedemann Kleint [Fri, 20 May 2011 08:10:32 +0000 (10:10 +0200)]
Designer: Extend container extension.

Make it possible to disable adding/removing pages by
adding respective bool virtual functions.

Useful for implementing containers with fixed, single
children like QScrollArea, QDockWidget, which require
a container extension to work properly in Qt Designer.
Previously, the problem was that the add/remove
page context menu actions were enabled for them,
leading to crashes und undesired behaviour.

Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Qt Continuous Integration System [Fri, 20 May 2011 02:18:56 +0000 (12:18 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Allow arthur tests to use private headers.

13 years agoAllow arthur tests to use private headers.
Jason McDonald [Fri, 20 May 2011 01:11:11 +0000 (11:11 +1000)]
Allow arthur tests to use private headers.

The tests include qapplication_p.h, therefore the .pro files need to
specify
    QT += core-private gui-private

Change-Id: Icd6d7ba31f79b8c7b15e0327dd5ce44c7f486221
Reviewed-by: Rohan McGovern
13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Qt Continuous Integration System [Fri, 20 May 2011 01:39:07 +0000 (11:39 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Remove mention of qt3support in makeselftest
  Remove Qt3Support test data from lancelot test
  Remove Qt3Support code from algorithms autotest
  Don't link qt3support lib in QMessageBox autotest

13 years agoRemove mention of qt3support in makeselftest
Jason McDonald [Thu, 19 May 2011 07:53:26 +0000 (17:53 +1000)]
Remove mention of qt3support in makeselftest

Change-Id: Ie081d3a543ff30e3e58e154cbfea57a29bb24210
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Qt Continuous Integration System [Fri, 20 May 2011 00:37:23 +0000 (10:37 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Remove Qt3Support code from QVariant autotest.
  Remove obsolete test data
  Remove Qt3Support code from QMenuBar test, part 2.

13 years agoRemove Qt3Support test data from lancelot test
Jason McDonald [Thu, 19 May 2011 06:33:48 +0000 (16:33 +1000)]
Remove Qt3Support test data from lancelot test

The data was already commented out and thus unused.

Change-Id: I234cea542bbacf429b6cb1fc0c9feec4f80e47e5
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
13 years agoRemove Qt3Support code from algorithms autotest
Jason McDonald [Thu, 19 May 2011 06:23:00 +0000 (16:23 +1000)]
Remove Qt3Support code from algorithms autotest

qHeapSort and qBubbleSort were Qt3 functions that were replaced by
qSort.  During modularization, the Qt3Support header containing these
routines (q3tl.h) was moved into the algorithms autotest, presumably
because that was the only thing that still included the header.
However, as these routines are not part of Qt5, they don't need to be
tested anymore.  This commit deletes the q3tl.h header and the test
functions that tested it.

Change-Id: I52eed7b4b4db3bd671dc6dbd752642bc9e783c30
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
13 years agoDon't link qt3support lib in QMessageBox autotest
Jason McDonald [Thu, 19 May 2011 05:38:30 +0000 (15:38 +1000)]
Don't link qt3support lib in QMessageBox autotest

Change-Id: I0126dc790e88639ad524cdf719ced2a444df9b71
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
13 years agoRemove Qt3Support code from QVariant autotest.
Jason McDonald [Thu, 19 May 2011 05:33:36 +0000 (15:33 +1000)]
Remove Qt3Support code from QVariant autotest.

This commit removes the four columns of test data that were only used
for testing Qt3Support features.

Change-Id: I93116b64ac49b0d6812595dfd58962ba8afbdad1
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
13 years agoRemove obsolete test data
Jason McDonald [Thu, 19 May 2011 05:12:27 +0000 (15:12 +1000)]
Remove obsolete test data

Remove test data for Qt3Support functions from the QTextStream autotest.
The code that used this data was removed in an earlier commit.

Change-Id: I26e34cdefd47287c6992cf1d31276a40994c607c
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
13 years agoRemove Qt3Support code from QMenuBar test, part 2.
Jason McDonald [Thu, 19 May 2011 04:22:14 +0000 (14:22 +1000)]
Remove Qt3Support code from QMenuBar test, part 2.

Follow-up to previous commit: remove the "_noQt3" suffixes on test
function names and the "_Qt4" suffixes on variable names.

Change-Id: I000e87357b025930b0065efc1d0de05c2cd07bba
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Qt Continuous Integration System [Thu, 19 May 2011 19:03:02 +0000 (05:03 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  New configure.exe binary

13 years agoNew configure.exe binary
Marius Storm-Olsen [Thu, 19 May 2011 18:41:57 +0000 (13:41 -0500)]
New configure.exe binary

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Qt Continuous Integration System [Thu, 19 May 2011 17:08:34 +0000 (03:08 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Full translucent background support in xcb and xlib backend.
  Lighthouse xcb and xlib: Add support for transparency of GLX windows.
  Lighthouse minimal: Add support for transparency
  Compile fixes for Xlib plugin.

13 years agoFull translucent background support in xcb and xlib backend.
Samuel Rødal [Thu, 19 May 2011 14:18:21 +0000 (16:18 +0200)]
Full translucent background support in xcb and xlib backend.

Make sure to pick an alpha visual also for non-GL surface types, and to
ask for alpha in the window format if the WA_TranslucentBackground
attribute is set.

Reviewed-by: Janusz Lewandowski
(cherry picked from commit 6241e39cff9311c943430ff2f31236b13618f2ac)

13 years agoLighthouse xcb and xlib: Add support for transparency of GLX windows.
Janusz Lewandowski [Thu, 19 May 2011 14:21:40 +0000 (16:21 +0200)]
Lighthouse xcb and xlib: Add support for transparency of GLX windows.

Merge-request: 1231
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
(cherry picked from commit a3b627e1c5ce03a2500ab35c64729b1995639dcc)

13 years agoLighthouse minimal: Add support for transparency
Janusz Lewandowski [Thu, 19 May 2011 14:21:39 +0000 (16:21 +0200)]
Lighthouse minimal: Add support for transparency

Merge-request: 1231
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
(cherry picked from commit c15b41056e60abdbb4d835e27a360f01be618a4f)

13 years agoCompile fixes for Xlib plugin.
Samuel Rødal [Thu, 19 May 2011 12:58:18 +0000 (14:58 +0200)]
Compile fixes for Xlib plugin.

(cherry picked from commit 4af11f2c6666c55657569f946c33816f33711225)

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Qt Continuous Integration System [Thu, 19 May 2011 14:58:20 +0000 (00:58 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Don't crash if windowmanager is not initialized
  Compile fix for 64bit Linux.

13 years agoDon't crash if windowmanager is not initialized
Lasse Holmstedt [Thu, 19 May 2011 14:30:44 +0000 (16:30 +0200)]
Don't crash if windowmanager is not initialized

This can happen if there is e.g. no wayland server.

Reviewed-by: sroedal
(cherry picked from commit aea5e35f57d061b133d2fa613d10f5e0118f5706)

13 years agoCompile fix for 64bit Linux.
Friedemann Kleint [Thu, 19 May 2011 14:27:29 +0000 (16:27 +0200)]
Compile fix for 64bit Linux.

Reviewed-by: Thiago <thiago.macieira@nokia.com>
13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Qt Continuous Integration System [Thu, 19 May 2011 14:23:38 +0000 (00:23 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Tests: Fix some compile warnings.

13 years agoTests: Fix some compile warnings.
Friedemann Kleint [Thu, 19 May 2011 14:19:01 +0000 (16:19 +0200)]
Tests: Fix some compile warnings.

As they are now compiled by default.

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Qt Continuous Integration System [Thu, 19 May 2011 12:53:06 +0000 (22:53 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Wayland: send surface id + process id pairs to compositor

13 years agoWayland: send surface id + process id pairs to compositor
Lasse Holmstedt [Thu, 19 May 2011 11:55:12 +0000 (13:55 +0200)]
Wayland: send surface id + process id pairs to compositor

This enables doing window/process management since we can now
actually map the process we've launched to a window.

Reviewed-by: Samuel Rødal
(cherry picked from commit 457c33d9fd308542c9290fd60bf86960f9251255)

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Qt Continuous Integration System [Thu, 19 May 2011 11:55:04 +0000 (21:55 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Remove warning from QColor::setNamedColor().

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Qt Continuous Integration System [Thu, 19 May 2011 11:21:09 +0000 (21:21 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Fixed compile of qdrawhelper_neon.cpp.

13 years agoRemove warning from QColor::setNamedColor().
Samuel Rødal [Fri, 6 May 2011 13:23:43 +0000 (15:23 +0200)]
Remove warning from QColor::setNamedColor().

This warning is pointless as the user can anyway check if the color is
valid after making the call by calling isValid(). Using isValidColor()
could be used but it has a big performance overhead as validation then
needs to be done twice.

Task-number: QTBUG-19098
Reviewed-by: Erik Verbruggen
(cherry picked from commit a423ff5474b89028eeca95b254f5184311c8223b)

13 years agoFixed compile of qdrawhelper_neon.cpp.
Samuel Rødal [Thu, 19 May 2011 08:45:50 +0000 (10:45 +0200)]
Fixed compile of qdrawhelper_neon.cpp.

We need to use the quad-word intrinsic and reinterpret the cast to
a signed int vector.

Reviewed-by: Kim Motoyoshi Kalland <kim.kalland@nokia.com>
(cherry picked from commit d2d7aef223a3bad368c6b7c7f7f4617f4acf323c)

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Qt Continuous Integration System [Thu, 19 May 2011 10:04:29 +0000 (20:04 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Compile IPC tests.
  Always call XInitThreads.
  Remove redundant #ifdef's from benchmarks
  Improve coding style of qdatastream test
  Don't use Qt3Support in arthur test suite.
  Remove Qt3Support code from QMenuBar autotest
  Remove Qt3Support code from QSplitter autotest
  Remove Qt3Support code from QSharedPointer autotest
  Remove Qt3Support code from QComboBox autotest
  Remove Qt3Support test code from accessibility autotest
  tests: allow unstable tests to be marked with CONFIG+=insignificant_test

13 years agoCompile IPC tests.
Friedemann Kleint [Thu, 19 May 2011 07:42:17 +0000 (09:42 +0200)]
Compile IPC tests.

13 years agoAlways call XInitThreads.
Gunnar Sletta [Thu, 19 May 2011 06:34:52 +0000 (08:34 +0200)]
Always call XInitThreads.

Any Qt application that embeds a QSGView needs to call this
because of the threaded renderer. Today applications that
use threaded GL silently fail. In a few weeks time, the
refactor branch will be merged, which will obsolete this
change, so it is a temporary measure to get tests and
examples running.

13 years agoRemove redundant #ifdef's from benchmarks
Jason McDonald [Wed, 18 May 2011 07:55:57 +0000 (17:55 +1000)]
Remove redundant #ifdef's from benchmarks

Preprocessor directives that refer to QT_VERSION's less than Qt 5 are
redundant in the qt5 modules.

Change-Id: Id3a9c5f0ba07b72d1c99e51c12a240570bf0d58e
Reviewed-by: Rohan McGovern
13 years agoImprove coding style of qdatastream test
Jason McDonald [Thu, 19 May 2011 03:54:19 +0000 (13:54 +1000)]
Improve coding style of qdatastream test

Expand literal tabs and format switch statements in accordance with the
Qt Coding Style.

Change-Id: I64e638b730f4be2bc707136b1b7e5585d6808731
Reviewed-by: Rohan McGovern
13 years agoDon't use Qt3Support in arthur test suite.
Jason McDonald [Tue, 17 May 2011 02:04:02 +0000 (12:04 +1000)]
Don't use Qt3Support in arthur test suite.

Change-Id: I5acc05aeb7db5aedbbe35594f46d614319a299b2
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
13 years agoRemove Qt3Support code from QMenuBar autotest
Jason McDonald [Wed, 18 May 2011 06:57:36 +0000 (16:57 +1000)]
Remove Qt3Support code from QMenuBar autotest

Change-Id: I63677bfe56ec92c1c96e2df5619ee434bdc91fdb
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
13 years agoRemove Qt3Support code from QSplitter autotest
Jason McDonald [Tue, 17 May 2011 03:59:13 +0000 (13:59 +1000)]
Remove Qt3Support code from QSplitter autotest

Note that the functions suffixed with a 3 were actually the Qt4
versions, which is why this patch looks strange.

Change-Id: Iec874153248f57b8696a289cb13eb60fecc5699c
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
13 years agoRemove Qt3Support code from QSharedPointer autotest
Jason McDonald [Tue, 17 May 2011 03:56:55 +0000 (13:56 +1000)]
Remove Qt3Support code from QSharedPointer autotest

Change-Id: I1bb3752e3a5101e4a2990d0cac01406e6023ee2e
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
13 years agoRemove Qt3Support code from QComboBox autotest
Jason McDonald [Tue, 17 May 2011 03:48:10 +0000 (13:48 +1000)]
Remove Qt3Support code from QComboBox autotest

This commit removes the second-last column of test data
(labeled testQt3Support) of the insertItem test function.

Change-Id: I2158bdb5a77c9eaf1424998f51fb03a8df934490
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
13 years agoRemove Qt3Support test code from accessibility autotest
Jason McDonald [Tue, 17 May 2011 03:46:26 +0000 (13:46 +1000)]
Remove Qt3Support test code from accessibility autotest

Change-Id: Id31836ea52da71b40c0bcbb67d9beffc70b90400
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
13 years agotests: allow unstable tests to be marked with CONFIG+=insignificant_test
Rohan McGovern [Thu, 19 May 2011 01:42:31 +0000 (11:42 +1000)]
tests: allow unstable tests to be marked with CONFIG+=insignificant_test

Marking a test with CONFIG+=insignificant_test will cause the exit code
of the test to be discarded during `make check'.  This is intended to be
used for tests which are valuable to run, but are known to be unstable
and are not feasible to immediately fix.

Reviewed-by: Jason McDonald
Change-Id: I50a712c33c2ebb0af39f1ea0bf2adef7f0936425

13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Qt Continuous Integration System [Thu, 19 May 2011 03:42:59 +0000 (13:42 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Remove Qt3Support code from QDataStream autotest.

13 years agoRemove Qt3Support code from QDataStream autotest.
Jason McDonald [Wed, 18 May 2011 01:39:06 +0000 (11:39 +1000)]
Remove Qt3Support code from QDataStream autotest.

QWMatrix and QColorGroup were Qt 3 classes and QPalette is substantially
different in Qt 3 and Qt 4.

Change-Id: Iee176fcf237c3f9ac2ffd7f1fd9e4963dc4df39c
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Qt Continuous Integration System [Thu, 19 May 2011 00:07:06 +0000 (10:07 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  tests: fixed compilation of tst_qtextstream
  QUiLoader, QAbstractFormBuilder: Introduce errorString().
  Enable configuration for Xcb
  Fall back to using paths for large fonts in drawStaticText()
  Add ability to work around non-standard GLES implementations
  Fix broken drawing with large fonts using QStaticText and FreeType
  Remove Q_ASSERT's from qdbustype autotest
  Remove autotest code for Qt3Support library.

13 years agotests: fixed compilation of tst_qtextstream
Rohan McGovern [Thu, 19 May 2011 00:00:47 +0000 (10:00 +1000)]
tests: fixed compilation of tst_qtextstream

Compilation of this autotest was broken by a strange qmake bug,
QTBUG-19393.  Work around it by putting a space between two string
literals.

Change-Id: I494c486dd11858eeaf98d7a04021c74fcf3cbba7

13 years agoQUiLoader, QAbstractFormBuilder: Introduce errorString().
Friedemann Kleint [Wed, 18 May 2011 12:39:44 +0000 (14:39 +0200)]
QUiLoader, QAbstractFormBuilder: Introduce errorString().

Introduce errorString() to be able to obtain load errors
in Qt Designer. Remove automatic Qt 3 form conversion
from Qt Designer (since uic3 no longer exists) and move
all form load error checking logic including language
check into QAbstractFormBuilder.
Make language accessible in FormBuilderExtra in case
Jambi is revived.

Reviewed-by: hjk
13 years agoEnable configuration for Xcb
Eckhart Koppen [Wed, 18 May 2011 14:35:04 +0000 (17:35 +0300)]
Enable configuration for Xcb

The xcb platform plugin can now be enabled using -xcb at configuration
time. A configuration time compilation check will be added at a later
point.

Reviewed-by: Samuel Rødal
13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging
Qt Continuous Integration System [Wed, 18 May 2011 14:16:06 +0000 (00:16 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging:
  QT_USE_QSTRINGBUILDER to fix source compatibility

13 years agoFall back to using paths for large fonts in drawStaticText()
Eskil Abrahamsen Blomfeldt [Wed, 18 May 2011 13:10:40 +0000 (15:10 +0200)]
Fall back to using paths for large fonts in drawStaticText()

QStaticText had an implicit risk which meant you had to make sure the
text size did not grow unreasonably large. This was intended to avoid
hiding the performance impact of using QStaticText for such a purpose,
but it's too inconvenient. Thus, the same fall back as in drawTextItem()
has been introduced. This will also fix a bug recently introduced when
we started using the FT cache to draw static text in the raster engine,
since this will fail for large fonts.

Task-number: QTBUG-19084, QTBUG-19370
Reviewed-by: Jiang Jiang
(cherry picked from commit 0aa9b30432cec3b7f366983f451fc9a7f8f83243)

13 years agoAdd ability to work around non-standard GLES implementations
Paul Olav Tvete [Wed, 18 May 2011 13:31:14 +0000 (15:31 +0200)]
Add ability to work around non-standard GLES implementations

Reviewed-by: Gunnar
13 years agoQT_USE_QSTRINGBUILDER to fix source compatibility
Olivier Goffart [Fri, 6 May 2011 11:13:42 +0000 (13:13 +0200)]
QT_USE_QSTRINGBUILDER to fix source compatibility

In 4.8 we added support for using StringBuilder with QByteArray.
But this is breaking source compatibility for people that used
QT_USE_FAST_OPERATOR_PLUS in Qt 4.7. So we introduce a new macro

Notice that QT_USE_FAST_CONCATENATION was not working without
QT_USE_FAST_OPERATOR_PLUS, so we remove the checking of that macro.

Reviewed-by: joao
(cherry picked from commit 8447f5616be731d78081f326bb9cb3f5aa9087a4)

13 years agoFix broken drawing with large fonts using QStaticText and FreeType
Eskil Abrahamsen Blomfeldt [Wed, 18 May 2011 10:16:33 +0000 (12:16 +0200)]
Fix broken drawing with large fonts using QStaticText and FreeType

In FreeType, there's a fall back to QFontEngine::alphaMapForGlyph()
when the fonts are very large. Since this uses a QPainterPath containing
an unhinted glyph, the use of hinted metrics would sometimes lead to
the glyphs being clipped because they would be positioned slightly
outside the image they were painted into. When outline drawing is on,
it makes sense to return unhinted metrics, since the glyphs we will
actually use are unhinted.

Task-number: QTBUG-19067
Reviewed-by: Jiang Jiang
13 years agoRemove Q_ASSERT's from qdbustype autotest
Jason McDonald [Wed, 18 May 2011 02:04:14 +0000 (12:04 +1000)]
Remove Q_ASSERT's from qdbustype autotest

Change-Id: I276750d8acda3744ee8a9c424b2da0a08e8c7461
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
13 years agoRemove autotest code for Qt3Support library.
Jason McDonald [Tue, 17 May 2011 03:43:30 +0000 (13:43 +1000)]
Remove autotest code for Qt3Support library.

This commit deals with the simple cases -- mostly just removing blocks
of code enclosed in #ifdef QT3_SUPPORT.  Later commits will deal with
the trickier cases.

Change-Id: I280dea25b3754be175efe62fc7e5e4e7c304e658
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Qt Continuous Integration System [Wed, 18 May 2011 01:39:26 +0000 (11:39 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Make QDataStream test compile and re-enable it

13 years agoMake QDataStream test compile and re-enable it
Jason McDonald [Tue, 17 May 2011 08:09:34 +0000 (18:09 +1000)]
Make QDataStream test compile and re-enable it

This test can't use svg files as QtSvg is a separate module, on which
qtbase does not depend.  This commit changes the test to use a pixmap
that was already present in the test.

Change-Id: Iab4ce70aa376a7d2985b69816bd251ce4f5d46cf
Task-number: QTBUG-19244
Reviewed-by: Rohan McGovern
13 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Qt Continuous Integration System [Wed, 18 May 2011 01:03:00 +0000 (11:03 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: (84 commits)
  Reduce usage of Q_ASSERT in autotests.
  Fixed license header.
  Remove Q_ASSERT's from qsharedmemory autotest
  Remove Q_ASSERT's from QNetworkReply autotest
  Remove Q_ASSERT from QXmlStream autotest
  Remove Q_ASSERT's from QXmlStream autotest
  Remove Q_ASSERT from QItemModel autotest
  Remove Q_ASSERT's from QXmlStream autotest
  Remove Q_ASSERT from QVariant autotest
  Remove Q_ASSERT's from QTreeView autotest
  Remove Q_ASSERT from qtesselator autotest
  Remove unused function from qtessellator autotest
  Remove Q_ASSERT's from qreadwritelock autotest
  Remove Q_ASSERT's from QObject autotest
  Remove Q_ASSERT's from QObject autotest
  Remove Q_ASSERT's from QNetworkReply autotest
  Remove Q_ASSERT from qitemmodel autotest
  Remove Q_ASSERT's from QMutex autotest
  Remove Q_ASSERT from QMetaType autotest
  Remove Q_ASSERT's in qitemview autotest
  ...

13 years agoReduce usage of Q_ASSERT in autotests.
Rohan McGovern [Wed, 18 May 2011 00:44:47 +0000 (10:44 +1000)]
Reduce usage of Q_ASSERT in autotests.

Using Q_ASSERT does nothing in release-mode builds, and in debug builds
it causes tests to terminate prematurely.  It is much better to use
QVERIFY or QCOMPARE.

Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 3475168550c1a804f04f2a4edfeb30c04cd36551)

Change-Id: Ic39972b685ca35a9a71d9c8d03e8dae31481fb19

13 years agoFixed license header.
Rohan McGovern [Fri, 13 May 2011 04:10:29 +0000 (14:10 +1000)]
Fixed license header.

(cherry picked from commit 2caea6081fc46217636f0ab70d09891efd2d2864)

Change-Id: I086c8cb2d0ccc691d8af68804132f048bee7fa4b

13 years agoRemove Q_ASSERT's from qsharedmemory autotest
Jason McDonald [Wed, 11 May 2011 02:00:40 +0000 (12:00 +1000)]
Remove Q_ASSERT's from qsharedmemory autotest

Report a fatal error rather than ignoring the error in non-debug builds.

Change-Id: Ib6ef993e6e0c65bd9adea994ea7b454cc147f3d4
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 637456edef085d1825f15429cd921f2f0d4bd6a2)

13 years agoRemove Q_ASSERT's from QNetworkReply autotest
Jason McDonald [Mon, 9 May 2011 02:18:50 +0000 (12:18 +1000)]
Remove Q_ASSERT's from QNetworkReply autotest

Rather than aborting in debug builds and failing mysteriously in release
builds, report fatal errors in all builds.

Change-Id: I020b06e19b7ffc8ae4413e1756259f4ca608f253
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit bbfefe1b764cd41b7e677f26621fb6e76a67f9d7)

13 years agoRemove Q_ASSERT from QXmlStream autotest
Jason McDonald [Tue, 10 May 2011 03:19:25 +0000 (13:19 +1000)]
Remove Q_ASSERT from QXmlStream autotest

Report a meaningful fatal error if an unknown token type is encountered
rather than ignoring the error in non-debug builds and reporting an
uninformative message in debug builds.

Change-Id: Id219f3c7cbd4ba3e9875cb81f833720d5d153132
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 1c85fc559ee456a165527d23cb1b7dc237f5504b)

13 years agoRemove Q_ASSERT's from QXmlStream autotest
Jason McDonald [Tue, 10 May 2011 01:43:08 +0000 (11:43 +1000)]
Remove Q_ASSERT's from QXmlStream autotest

Report fatal errors rather than ignoring them in non-debug builds.

Change-Id: I62dd177e2f391e64c12314bf224f8952ed6f3144
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 4793c3bd1dfddcc98eae12e5caf29ff6aabd31b2)

13 years agoRemove Q_ASSERT from QItemModel autotest
Jason McDonald [Tue, 10 May 2011 01:48:36 +0000 (11:48 +1000)]
Remove Q_ASSERT from QItemModel autotest

If populateTestData() would return an invalid model index, report a
meaningful fatal error rather than failing silently in a release build
and aborting with an uninformative error message in a debug build.

Change-Id: I96820429a25ce5c4eb375d50e7e1f672851e26e6
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 984a72a8bbf853059f0eb7e1054538b48d5f3bc8)

13 years agoRemove Q_ASSERT's from QXmlStream autotest
Jason McDonald [Tue, 10 May 2011 01:33:37 +0000 (11:33 +1000)]
Remove Q_ASSERT's from QXmlStream autotest

Report fatal errors rather than ignoring them in non-debug builds.

Change-Id: Ieafc58f3603fa953f4a963394039e613dcd442fb
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 6e3fcd6ff50e6435fd90629ed695196d25312ffc)

13 years agoRemove Q_ASSERT from QVariant autotest
Jason McDonald [Mon, 9 May 2011 07:34:45 +0000 (17:34 +1000)]
Remove Q_ASSERT from QVariant autotest

I missed one Q_ASSERT in the previous commit.  Also changing to use
Q_FUNC_INFO instead of hard-coded function names in the warning
messages.

Change-Id: I0ff5b2b2cda02597836beb5d2811fa8dd2a344ab
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 74a4aad171b39018d596b99684286b9426a091a5)

13 years agoRemove Q_ASSERT's from QTreeView autotest
Jason McDonald [Mon, 9 May 2011 07:14:39 +0000 (17:14 +1000)]
Remove Q_ASSERT's from QTreeView autotest

Report fatal errors instead of failing silently in non-debug builds.

Change-Id: Ieaff30b71dba2a385a5fffc93d2a8c0f5864aa18
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit e12b912de89088a307c3519a01198a5314b8dd1a)

13 years agoRemove Q_ASSERT from qtesselator autotest
Jason McDonald [Mon, 9 May 2011 05:53:13 +0000 (15:53 +1000)]
Remove Q_ASSERT from qtesselator autotest

Report a fatal error rather than failing silently in non-debug builds.

Change-Id: I625c5aa6f86a5764cd8f078baa074d6475a67736
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit c0c7e04c9248ce38278aceefeb527f29149cfb4e)

13 years agoRemove unused function from qtessellator autotest
Jason McDonald [Mon, 9 May 2011 05:47:20 +0000 (15:47 +1000)]
Remove unused function from qtessellator autotest

Change-Id: I24c1db8392370d19970421a014f7bb6c4bc7c6e8
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 224050aae75fd5b1d6c57909d894a3eba7ac43fc)

13 years agoRemove Q_ASSERT's from qreadwritelock autotest
Jason McDonald [Mon, 9 May 2011 03:46:32 +0000 (13:46 +1000)]
Remove Q_ASSERT's from qreadwritelock autotest

The tryWriteLock testfunction didn't do anything useful in non-debug
builds, due to the thread having the important code inside Q_ASSERT's,
which are no-ops in non-debug builds.  This commit removes the
Q_ASSERT's, counts the number of failures in the thread and fails the
test if there are any failures recorded.

Change-Id: I4750f66eeba22ab51ba348ebc06704052421f1ae
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 00f724c943b83f10f9ca9475570708536947538e)

13 years agoRemove Q_ASSERT's from QObject autotest
Jason McDonald [Mon, 9 May 2011 03:16:39 +0000 (13:16 +1000)]
Remove Q_ASSERT's from QObject autotest

Rather than aborting in debug builds and failing silently in release
builds, report a fatal error in all builds if the helper class
methods are called more than once.

Change-Id: Id1fda8dc7caf008bbc8f6ae6384abee1aa8f50eb
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 0c157af3e5aa7c56c53b9eabe1510cc639610969)

13 years agoRemove Q_ASSERT's from QObject autotest
Jason McDonald [Mon, 9 May 2011 03:01:40 +0000 (13:01 +1000)]
Remove Q_ASSERT's from QObject autotest

Rather than aborting in debug builds and failing silently in release
builds, report a meaningful fatal error in all builds.

Change-Id: I3b874f187d482e9785a839cab1a3855b631404c3
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 844906474dd6905d36003143a03a2fbccf0ad0dd)

13 years agoRemove Q_ASSERT's from QNetworkReply autotest
Jason McDonald [Mon, 9 May 2011 01:50:23 +0000 (11:50 +1000)]
Remove Q_ASSERT's from QNetworkReply autotest

Rather than aborting in debug builds and ignoring the failure in release
builds, report a fatal error in all builds.

Change-Id: I1fb8e692c65cf23cf5d2453173db742260ddca48
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 136f39bbb63706819eb18d000f305edbe1cc6a81)

13 years agoRemove Q_ASSERT from qitemmodel autotest
Jason McDonald [Fri, 6 May 2011 05:12:03 +0000 (15:12 +1000)]
Remove Q_ASSERT from qitemmodel autotest

Don't perform actions needed for the test inside Q_ASSERT, because these
actions won't happen in a non-debug build.

Change-Id: I0758e9f29f38c1a83a1501357286877f05beb6c8
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit b7d421da6d5e945b74ffbc3a7aa635a6ce63ebda)

13 years agoRemove Q_ASSERT's from QMutex autotest
Jason McDonald [Fri, 6 May 2011 06:55:31 +0000 (16:55 +1000)]
Remove Q_ASSERT's from QMutex autotest

Don't perform actions needed for the test inside Q_ASSERT, because these
actions won't happen in a non-debug build. Instead count the number of
failures and verify that the count is zero at the end of the test.

Change-Id: Ibe0d194111e5247118d59a7760f0946d2c44faf9
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 8d2127d44e6c8af6b041688376de0e5747a1810a)

13 years agoRemove Q_ASSERT from QMetaType autotest
Jason McDonald [Fri, 6 May 2011 06:34:15 +0000 (16:34 +1000)]
Remove Q_ASSERT from QMetaType autotest

Replace Q_ASSERT in helper class with code to count failures and report
meaningful warnings.  The test function then fails the test if any
failures were recorded.

Change-Id: I0d6650e6036c8e45729c16d1dbb7543b4fb42553
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 8512dc16553ecf511c40a2ba7a815f777d7d5c59)

13 years agoRemove Q_ASSERT's in qitemview autotest
Jason McDonald [Fri, 6 May 2011 06:22:25 +0000 (16:22 +1000)]
Remove Q_ASSERT's in qitemview autotest

Rather than aborting in debug builds and failing silently in release
builds, report a meaningful warning message and return an appropriate
value to indicate the error.

Change-Id: I0ceb0a0bfaef34cc6127d768cc75ecfc5a24e3c9
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 7cb0a3baeb361c9909e8ab2caf436e8e44b6a3b6)

13 years agoRemove Q_ASSERT from qitemmodel autotest
Jason McDonald [Fri, 6 May 2011 05:22:07 +0000 (15:22 +1000)]
Remove Q_ASSERT from qitemmodel autotest

If populateTestData() is passed an unknown type of model, report a
meaningful fatal error rather than failing silently in a release build
and aborting with an uninformative error message in a debug build.

Change-Id: I7ee8d1262bbced304f9f24c2ec9b40a38704d982
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 6b2e89843a573cd7c143bca17cec8e69209d2fbd)

13 years agoRemove Q_ASSERT from algorithms autotest
Jason McDonald [Fri, 6 May 2011 04:43:03 +0000 (14:43 +1000)]
Remove Q_ASSERT from algorithms autotest

Report a meaningful warning message rather than aborting in a debug
build and failing silently in a release build.

Change-Id: Ic77589143ff0d22c95c7b10f2e511f68b3da4d86
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 75767c69fbba3149a4505287ed441886188a9fd3)

13 years agoRemove Q_ASSERT's from qabstractfileengine test
Jason McDonald [Fri, 6 May 2011 03:12:10 +0000 (13:12 +1000)]
Remove Q_ASSERT's from qabstractfileengine test

Rather than aborting in debug builds and failing silently in release
builds, report a meaningful warning message and skip setting the
filename, which should cause a subsequent test failure.

Change-Id: I3ae4f4de7b02bf2194019047fa87d8ae06d95634
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit e6f7509f18ae88069373d59073cbdcda88fd19c8)

13 years agoRemove Q_ASSERT's from modeltest
Jason McDonald [Thu, 5 May 2011 01:58:24 +0000 (11:58 +1000)]
Remove Q_ASSERT's from modeltest

Rather than aborting in debug builds and ignoring the failures in
release builds, report specific warnings on each failure, count the
failures, and fail the test if the failure counts are non-zero at the
end of the test.

The same change is also made for a QCOMPARE that appeared
inappropriately inside a helper class.  QCOMPARE may only appear
directly in a test function.

Change-Id: I81f0ce80512fa72c67f5aa72c0511a4b650d5d20
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 11254ff409395b67cb28453b3c069860bc28c14d)

13 years agoRemove Q_ASSERT from modeltest
Jason McDonald [Thu, 5 May 2011 04:04:16 +0000 (14:04 +1000)]
Remove Q_ASSERT from modeltest

Report an informative fatal error if passed a null model, rather than
aborting in a debug build and giving a bunch of signal connection errors
in a release build.

Change-Id: Ia240e741b9d6ec03fd5ed3a14cf4fa44b55af911
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 841cc610df61a266ebcca2bfef2542a7d4fea68d)

13 years agoRemove Q_ASSERT's from modeltest
Jason McDonald [Thu, 5 May 2011 01:20:56 +0000 (11:20 +1000)]
Remove Q_ASSERT's from modeltest

Report a fatal error in all builds, not just in debug builds.

Change-Id: Ia9e265b2082b55fbac18ca046e586de863ac0623
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 22e99d92a71645d643ebd54c6209bced80f7c5b8)

13 years agoRemove Q_ASSERT's from QAbstractFileEngine autotest
Jason McDonald [Thu, 5 May 2011 04:40:40 +0000 (14:40 +1000)]
Remove Q_ASSERT's from QAbstractFileEngine autotest

Rather than aborting in debug builds and ignoring failures in release
builds, report meaningful warnings into the test output and return
sentinel values that will cause QVERIFY/QCOMPARE of the returned values
to fail the test.

Change-Id: I2c5a820637337d0762c71db10a4f270d36b31662
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 524bd6b7120f70a178b03bc6d337e08abd327076)