Jason McDonald [Tue, 3 May 2011 07:37:05 +0000 (17:37 +1000)]
Remove Q_ASSERT's from QXmlStream autotest.
Report a fatal error in all builds rather than only in debug mode
builds.
Change-Id: I6b3a999dd3ccf00ae66a86b43c125d7082cf0ae5
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
c183540c6c244f327ebd834167799072dcc3b72d)
Jason McDonald [Wed, 4 May 2011 00:56:50 +0000 (10:56 +1000)]
Remove Q_ASSERT's from qtestlib selftests
Report a fatal error in all builds rather than just in debug mode
builds.
Change-Id: Ie54e55ea2dd13bbb12e4265278db832ac1297c28
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
8a1279b0ae180fae94d3da1a4eeb20df5a748d33)
Jason McDonald [Tue, 3 May 2011 07:30:43 +0000 (17:30 +1000)]
Remove unused code from QXmlStream autotest
Change-Id: I719e502ef14848a22d41de71245fe6b6758c8d6b
Reviewed-by: Rohan McGovern
(cherry picked from commit
614474fb3d440eabd3ba7e381d246064ce39f4fa)
Jason McDonald [Tue, 3 May 2011 07:16:52 +0000 (17:16 +1000)]
Remove Q_ASSERT from qxmlsimplereader autotest
Verify the success of setting the document content in the test function
rather than using Q_ASSERT.
Change-Id: I25e017e7f92803867a998b4f09ad9f717212a9bc
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
d7453aef14b80a5972909ed99f1b4c765b7436a5)
Jason McDonald [Tue, 3 May 2011 06:39:50 +0000 (16:39 +1000)]
Remove Q_ASSERT from QXmlInputSource autotest
Report a fatal error in all builds rather than aborting in debug mode
builds only.
Change-Id: I53b348f077c6533433e32bbebd159066a2bc2c37
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
4f818b8bcf51cf9c654edbf319d90f6c77a09b3e)
Jason McDonald [Tue, 3 May 2011 06:17:43 +0000 (16:17 +1000)]
Remove Q_ASSERT from QLibrary autotest
Report a regular test failure rather than aborting when an unknown
operation is requested.
Change-Id: I3678f42f9e9f895d8d0d49a768d4c8b575d1863f
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
22aa68ecec96da4d14a4c9fe2f6e4a337b13b4a3)
Jason McDonald [Tue, 3 May 2011 06:14:03 +0000 (16:14 +1000)]
Remove Q_ASSERT from QSharedPointer autotest
Report a meaningful fatal error instead of aborting in debug mode builds
and failing silently in release mode builds.
Change-Id: I0f939dc40810f072a3e24aeba085191793c49ef3
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
b988b2f9f04ac0ebce7a779cd9bd5d394bfa1c95)
Jason McDonald [Tue, 3 May 2011 06:12:05 +0000 (16:12 +1000)]
Remove Q_ASSERT from QThread autotest
Report a meaningful fatal error instead of aborting in debug mode builds
and failing silently in release mode builds.
Change-Id: If9a6c0655e021b3bb6b7d894aefd9bbcc58e4605
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
fed42f25e129af1f4f2c03a075530ad7111d2fdd)
Jason McDonald [Tue, 3 May 2011 06:08:25 +0000 (16:08 +1000)]
Remove Q_ASSERT's from QWizard autotest
Combine the two checking functions (check and checkInvariant) and have
the resulting check function return a bool instead of asserting so that
the test function can QVERIFY and fail gracefully.
Change-Id: Ib069b5424483ba6ffb9caf75036c4f325e9dba51
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
a54900d2227bfb2021c5d1255817824aff11cf32)
Jason McDonald [Tue, 3 May 2011 06:04:31 +0000 (16:04 +1000)]
Remove mention of Q_ASSERT in comments
This will make it easier to check for stray Q_ASSERT's in the future.
Change-Id: I5ddafe1bf26819566460920deae8ff448008c93f
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
b2db13f245f09f1d14af64d2199284c78cbb5b6e)
Jason McDonald [Tue, 3 May 2011 05:58:24 +0000 (15:58 +1000)]
Remove Q_ASSERT's from QVariant autotest.
Print a meaningful warning message instead of aborting in debug
mode builds and failing silently in release mode builds.
Change-Id: I44143c5fbe6b6af87bdf5bd231cfaf9a3c9c33f8
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
a8dc321b6669dd263a25a0cb5766e5b7150c6e20)
Jason McDonald [Tue, 3 May 2011 05:47:55 +0000 (15:47 +1000)]
Remove Q_ASSERT from QTextOdfWriter autotest
If the <dummy> tag can't be found in the data, return an empty string
rather than asserting, so that the test fails gracefully.
Change-Id: I536f08c9c3e942817680849d96d035999d4994db
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
a88dd1c5f62b5ded8ea0d76d185127ef28549c72)
Jason McDonald [Tue, 3 May 2011 04:56:05 +0000 (14:56 +1000)]
Remove Q_ASSERT from qtesselator autotest
If the test data is incorrect, print a meaningful warning into the test
output instead of deferencing an iterator beyond the last element in
the list.
Change-Id: I7be4f282639453de6d8240a2f17253025b415337
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
f01e2a5024db69913aed016e2854b2589ca85080)
Rohan McGovern [Wed, 18 May 2011 00:26:00 +0000 (10:26 +1000)]
Remove Q_ASSERT from qsslsocket autotest.
Make the server thread exit early if the socket is invalid. This will
make the test fail gracefully instead of crashing.
Change-Id: Ia9564c94dd32d65e6e9bdb4a2410f1512409546c
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
b9b3ced2eafe13e491d5af5ad7432733941bfd8d)
Conflicts:
tests/auto/qsslsocket/tst_qsslsocket.cpp
Jason McDonald [Tue, 3 May 2011 02:56:16 +0000 (12:56 +1000)]
Remove Q_ASSERT's from qsharedpointer autotest
Report a meaningful warning message into the test output rather than
aborting in debug mode and doing nothing in release mode.
Change-Id: I6883fccbce0139c763f36f6839bb3452d8f69c1c
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
5b86c4abc676b36d60e6625e89535e7f4907d2b3)
Jason McDonald [Tue, 3 May 2011 01:59:05 +0000 (11:59 +1000)]
Remove Q_ASSERT's from QObject autotest.
The Receiver class has two slots that aren't meant to get called during
the test (they're there to catch broken parsing of slot names). Rather
than asserting when one of them gets called, which does nothing in a
release mode build, this commit makes the slots record the number of
times they were called (as for the other slots in the test) and fails
the test gracefully if either of those slots was called.
Change-Id: Ia0393026cb96ffdc6190b5e7bd951f75d231b11e
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
7bd6ca895e5fa4de197d9d7bf2e7b578c01c3c2a)
Jason McDonald [Tue, 3 May 2011 01:48:40 +0000 (11:48 +1000)]
Remove Q_ASSERT's from QMetaType autotest.
Instead of asserting in debug mode and doing nothing in release mode,
put specific warnings in the test output and fail the test gracefully.
Change-Id: I453a0ab7ddef5b2acf55f77f71a59a940d93ae54
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
a3b2fa3f1beffa7709c11522d4e2db9ec8f952e0)
Jason McDonald [Tue, 3 May 2011 01:44:16 +0000 (11:44 +1000)]
Remove Q_ASSERT from QMetaObject autotest.
Issue a helpful warning rather than ignoring the error in release mode
builds.
Change-Id: Iea7bf4d63f8227abaf7dcf1700c5fef62763afad
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
6f082a3fdd368cd7a969b7f324354583d081da82)
Jason McDonald [Tue, 3 May 2011 01:35:25 +0000 (11:35 +1000)]
Change Q_ASSERT to QVERIFY in QMenu test.
Change-Id: Ifc08d4eabd8565cfd242ec2e70cf597e92f28fe3
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
291f04a4a7be4a975c6b8eaeeed4e0c196e23128)
Jason McDonald [Tue, 3 May 2011 01:25:17 +0000 (11:25 +1000)]
Remove Q_ASSERT from qitemview autotest
Allow createView() to return a null view on failure (which it already
did in release mode builds), but fail the test gracefully instead of
crashing when a null view is returned. Also reordered the code slightly
to put all the QFETCH's together.
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
Change-Id: I3a41c738cb0e4e860db2342b30817a804b20f30d
(cherry picked from commit
51b1d8dc20a2557d2002550b03e5b9f37f425fb4)
Jason McDonald [Tue, 3 May 2011 00:52:52 +0000 (10:52 +1000)]
Remove Q_ASSERT from qitemmodel autotest
Allow createModel() to return a null model on failure (which it already
did in release mode builds), but fail the test gracefully instead of
crashing when a null model is returned.
Change-Id: Iaa0ec31183e0c90fcea512223d01e07ed188a380
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
0d773d839e39f4f4bfd0bf9d652e4f2650adfcb0)
Jason McDonald [Tue, 3 May 2011 00:48:14 +0000 (10:48 +1000)]
Remove mention of Q_ASSERT from qheaderview autotest
Change-Id: I3a97411c0b53345bffbadb60a3e7caabfb0441d2
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
a388e104febb131cd35438bbb1397eeab41d3ab8)
Jason McDonald [Tue, 3 May 2011 00:44:51 +0000 (10:44 +1000)]
Remove dead code from qgraphicsgridlayout autotest
Change-Id: I230d1ec9dfd5df2a0fac161a03090308b7f07a1e
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
012b2d8198b8cfe39a66025334ed9ae2a045a68c)
Jason McDonald [Tue, 3 May 2011 00:38:03 +0000 (10:38 +1000)]
Remove Q_ASSERT from qgraphicsanchorlayout test
Q_ASSERT will only catch a violation of the precondition of the
checkReverseDirection function in a debug build. This commit replaces
the Q_ASSERT with QVERIFY'ing the precondition (that the widget has a
layout) before calling the function.
Change-Id: Ibaa2b52b7d67fa20784e0df022e8c8169da0e50e
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
d1011fc9328fa335bc69a065b29e77ce60608c55)
Jason McDonald [Thu, 21 Apr 2011 05:33:01 +0000 (15:33 +1000)]
Remove Q_ASSERTs from qgraphicsanchorlayout1 test
Sanity-check the test data when using it rather than when creating it.
Change-Id: Ie5d5e1ff3fc439d196096f17cb6f97680927a90c
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
2c64404e2edd3b792b8a1d04c773860d40c04c4c)
Jason McDonald [Thu, 21 Apr 2011 04:49:41 +0000 (14:49 +1000)]
Only ignore warning when it can actually be produced.
Fix regression introduced in
3ca51d87296bcb3098d7de14294fef9294fd5ed4.
The warning is only generated in builds where QT_NO_DEBUG is not
defined *and* the target is not Mac OS X.
Change-Id: I7245f2eab8ea47ab7495fef874b2f8a29186b659
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
60e5ed805af1e11aaec426b823df209b4c895c29)
Jason McDonald [Thu, 21 Apr 2011 03:00:06 +0000 (13:00 +1000)]
Use meaningful variable names
Make the meaning of the code more obvious and avoid a compiler
warning about the variable "w" being overridden.
Change-Id: Ib76d3aa1cae46e263b2ab61b675d9ef74032aacc
Reviewed-by: Rohan McGovern
(cherry picked from commit
59634e825f1efa6f32befc8767cafedfeb9b7d59)
Jason McDonald [Thu, 21 Apr 2011 01:15:35 +0000 (11:15 +1000)]
Fix logic error in large file autotest
The function generating data blocks was filling the block to 16 bytes
short of the blockSize, then appending three 8 byte values, causing the
block to grow 8 bytes beyond blockSize and then truncating it back to
blockSize.
This commit makes the code fill the block to 24 bytes short of the
blockSize, so that the block will always end up at the correct size and
truncation is not needed.
Change-Id: I9fe6e6d6cf7bc445513b53e0a910d205c4c8002f
Reviewed-by: Rohan McGovern
(cherry picked from commit
b1eb564830ff1b754de14919ce5c1547e9758f7c)
Jason McDonald [Wed, 20 Apr 2011 06:27:07 +0000 (16:27 +1000)]
Remove Q_ASSERT from QDom autotest
The Q_ASSERT here should really be a QVERIFY. Expanded the trivial
helper function to make it more obvious what the test does.
Change-Id: Ia6017fe820a83b4d6101e5edcfcb68993eef233a
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
6181805f9ea66b37ee164bd67bdac2ac9d53fb65)
Jason McDonald [Wed, 20 Apr 2011 06:03:42 +0000 (16:03 +1000)]
Remove Q_ASSERT from datetimeedit autotest
The assert and the last four parameters of makeList() are not needed.
The function is always used to make lists of three integers and the data
are all >= 0.
Change-Id: I93ae5a5f541cde2ff61bd9dd21164ed4a9b57403
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
e754832eff8e1a35fc2681ae69b6e3b1ad666ddb)
Jason McDonald [Wed, 20 Apr 2011 05:11:23 +0000 (15:11 +1000)]
Remove Q_ASSERT from qcopchannel autotest
This code would assert in a debug build and potentially crash in a
release build. (The behaviour of QStringList::at() with an out-of-bounds
index is undefined.) This commit makes the program exit with a useful
error message in all builds.
Change-Id: Ia57a2e5693eb25d3eb0b9ba701ed485dfbc1e846
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
5a530f6171a9569d1a35cd8cd1015ec796b048cc)
Jason McDonald [Wed, 20 Apr 2011 02:16:58 +0000 (12:16 +1000)]
Remove Q_ASSERT from QCompleter autotest
If a combobox had no completer, this test would assert in a debug build
and crash in a release build. This commit makes the test report a test
failure and avoid terminating in all builds.
Change-Id: Ib2924412e3d55f10875675cb65079259cd4ef552
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
a5bd4abed834ce3670b2f28d4f932d612a033b36)
Jason McDonald [Wed, 20 Apr 2011 01:39:14 +0000 (11:39 +1000)]
Only ignore warning when it can actually be produced.
Fix regression introduced in
3ca51d87296bcb3098d7de14294fef9294fd5ed4.
The warning is only generated in builds where QT_NO_DEBUG is not
defined.
Change-Id: I9aa3db369094f4046062b5dc1dc694342208ee45
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
67bc4990f7541cca089882a8c3be1b2b8d98cd4c)
Jason McDonald [Wed, 20 Apr 2011 01:05:55 +0000 (11:05 +1000)]
Remove Q_ASSERT from qcompleter autotest.
Replace obscure failure on bad test data in debug builds with an
informative warning in all builds.
Change-Id: I9001820f34de2f78bf296a2f0e095ce73d9ac4bd
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
34c077faae538adc12d4aa28113640570dfc8728)
Jason McDonald [Tue, 19 Apr 2011 08:02:33 +0000 (18:02 +1000)]
Remove Q_ASSERT from qatomicint/pointer autotests
Some code in these tests is not intended to be executed, but rather to
detect compiler warnings. Instead of having an obscure fatal error if
this code is run in a debug build, it now has a clear fatal error if run
in any build.
Change-Id: I1c9d27bb14ebf3313865b68e3e57668ba1d14e25
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
70f42ced8e01ddf0098b143e5804c22d55ebf16f)
Jason McDonald [Tue, 19 Apr 2011 07:15:24 +0000 (17:15 +1000)]
Fix remaining warnings in accessibility autotest
Prevent warnings about unhandled accessibility events by managing object
lifetimes appropriately.
Change-Id: If72a2a6a76527ff746b99634c2d0895354570724
Reviewed-by: Rohan McGovern
(cherry picked from commit
bf1d860143ff40330c6e8f3e2872f2ae812adaa7)
Jason McDonald [Tue, 19 Apr 2011 06:15:57 +0000 (16:15 +1000)]
Ignore expected warning in accessibility autotest
Change-Id: I4b614766d2451dde51ab1207267301a2fe7dd0f6
Reviewed-by: Rohan McGovern
(cherry picked from commit
3ca51d87296bcb3098d7de14294fef9294fd5ed4)
Rohan McGovern [Tue, 17 May 2011 23:58:16 +0000 (09:58 +1000)]
If accessibility isn't built, don't try to test it
Only build the autotest when the feature to be tested is in the Qt
build. This is better than building and running an empty test.
Change-Id: I67721f5f48296afcca64f761d12325f8e040f2d8
Reviewed-by: Rohan McGovern
(cherry picked from commit
cf911bc0d297ed30e615fd115b0d3ae574cb2412)
Conflicts:
tests/auto/qaccessibility/tst_qaccessibility.cpp
Jason McDonald [Tue, 19 Apr 2011 04:09:44 +0000 (14:09 +1000)]
Remove unused function.
Change-Id: I197ca88e04a68dca0ea819d6e335a02607e597aa
Reviewed-by: Trust Me
(cherry picked from commit
1a98c473fbcbb6a9edf1b7e42babbad7d901edb4)
Jason McDonald [Tue, 19 Apr 2011 03:55:05 +0000 (13:55 +1000)]
Remove Q_ASSERT from accessibility autotest
Instead of crashing when we can't get a QAccessibleInterface for a
widget, output a useful warning and return a value that makes the test
fail gracefully.
Change-Id: I0b292cdd8f5a59e26bdc9b0b67cea2b58591df7d
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
d8dc5bfdff25d72e8276c6e80080d72315abe7e0)
Jason McDonald [Tue, 19 Apr 2011 03:39:35 +0000 (13:39 +1000)]
Remove unused functions.
Change-Id: I8cae0550c58238bd99bc759c21b022c54fe2de8b
Reviewed-by: Trust Me
(cherry picked from commit
1191dc0c278ddd22556d6c8e5ea5a898fa7b35f6)
Jason McDonald [Tue, 19 Apr 2011 02:05:59 +0000 (12:05 +1000)]
Remove Q_ASSERT calls from gestures autotest
Make the test report a useful warning, rather than terminating with an
unintelligible assertion failure, if the GestureState enum is ever
extended.
Change-Id: Ib876a5f2986cbea4e181678a83a72e0d1444f1ee
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit
ed5dd84582881bc30a5ce85902b37aae9c243978)
Jason McDonald [Mon, 18 Apr 2011 08:21:03 +0000 (18:21 +1000)]
Cosmetic changes to exceptionsafety_objects test
Sort test data alphabetically and remove excess whitespace.
Change-Id: I0e244efca9e9adbe747a375a28a63f70992ef4f8
Reviewed-by: Trust Me
(cherry picked from commit
10f3f270c8a319205590ae13bdeab063d5216441)
Jason McDonald [Mon, 18 Apr 2011 07:21:03 +0000 (17:21 +1000)]
Don't try to run exceptionsafety_objects test by default on windows.
This test relies on some API specific to MSVC's debug runtime, which is
not always guaranteed to be available.
Change-Id: Ib0ae4694ad51f59198dadfce802f0dfdf0522002
Reviewed-by: Rohan McGovern
(cherry picked from commit
01dfb9ca25bfaec5784f404dcd4bf41bbc2b6fcb)
Jason McDonald [Mon, 18 Apr 2011 05:38:38 +0000 (15:38 +1000)]
Partially re-enable exception safety test
Re-enabling for object types that don't crash the test.
Change-Id: I8c2f0d02171c973bf1ede227d4139b52cac5939f
Reviewed-by: Rohan McGovern
(cherry picked from commit
3788a90338e9328710b9d3335a63fb85ab7d97fc)
Jason McDonald [Mon, 18 Apr 2011 04:27:44 +0000 (14:27 +1000)]
Make test compile in namespaced build.
Change-Id: I824864b8db755a8dc731e3c9de39e3dd7b16224a
Reviewed-by: Rohan McGovern
(cherry picked from commit
ced0a98b5274be6a62ae7e4a0f9fc3161d0e40cb)
Jason McDonald [Mon, 18 Apr 2011 01:11:47 +0000 (11:11 +1000)]
Rename test class.
Fixes warning from tst_maketestselftest about test class name not
matching TARGET.
Change-Id: I7a81d87bb64d2902e842d097248e33eacb388746
Reviewed-by: Rohan McGovern
(cherry picked from commit
069e4441f2e14a82b4ae39601734acb71c909bd9)
Jason McDonald [Fri, 15 Apr 2011 07:35:13 +0000 (17:35 +1000)]
Make tst_exceptionsafety_objects part of the test set.
Re-enable this test, with the two test functions that fail on Linux
disabled until the failures can be diagnosed.
Change-Id: I915e1a0d675cb71a80086e89f9799a4f9f6b600c
Reviewed-by: Rohan McGovern
(cherry picked from commit
ee55dec1efe9c67518bf3e27f81b0696075f7153)
Qt Continuous Integration System [Mon, 16 May 2011 15:15:50 +0000 (01:15 +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 auto tests.
Bjørn Erik Nilsen [Mon, 16 May 2011 14:59:05 +0000 (16:59 +0200)]
Compile auto tests.
Reviewed-by: mstormo
Qt Continuous Integration System [Mon, 16 May 2011 08:33:46 +0000 (18:33 +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:
Update configure to enable QtConcurrent for Symbian
Liang Qi [Tue, 19 Apr 2011 05:27:50 +0000 (07:27 +0200)]
Update configure to enable QtConcurrent for Symbian
(cherry picked from commit
5fc99e9f8e3b24c712d1673d3b55afa8c8090cb4)
Qt Continuous Integration System [Mon, 16 May 2011 03:16:12 +0000 (13:16 +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: clean up usage of QT_CONFIG to fix circular dependencies
Rohan McGovern [Mon, 16 May 2011 00:43:14 +0000 (10:43 +1000)]
tests: clean up usage of QT_CONFIG to fix circular dependencies
With modularized Qt, using QT_CONFIG is dangerous, because the behavior
changes depending on the order in which modules are qmake'd.
For example, an autotest doing:
contains(QT_CONFIG,svg):QT += svg
...will depend on libQtSvg if (and only if) the autotest is qmake'd
_after_ qtsvg is qmake'd.
This makes the tested functionality unpredictable.
Also, if the above example occurs within qtbase, it causes the test to
sometimes have a circular dependency: if qtsvg is qmake'd before the
test is qmake'd, the test in qtbase depends on qtsvg which depends on
qtbase.
Tests must avoid functionality tests via QT_CONFIG except where all the
tested modules are dependencies of the current module.
Usage of QT_CONFIG with qt3support was entirely removed since Qt5
will not retain qt3support.
Reviewed-by: Jason McDonald
Change-Id: I5a5013b3ec7e1f38fb78864763c9e7586c15e70b
Qt Continuous Integration System [Fri, 13 May 2011 15:53:05 +0000 (01: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:
Removed duplicate setting of QT dependencies
Eckhart Koppen [Fri, 13 May 2011 15:36:12 +0000 (18:36 +0300)]
Removed duplicate setting of QT dependencies
Reviewed-by: TrustMe
Qt Continuous Integration System [Fri, 13 May 2011 14:34:32 +0000 (00:34 +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:
Temporarily changed autotest behaviour to ignore Qt version
Updated version references in autotests
Updated default Qt version to 5.0.0
Removed deprecated functions in QList
Updated Qt and QtBase module version number to 5.0.0
Updated data stream version for Qt 4.9 and 5.0
Eckhart Koppen [Fri, 13 May 2011 14:28:20 +0000 (17:28 +0300)]
Temporarily changed autotest behaviour to ignore Qt version
Version past 5.0.0 was checked, but the test failed to compile in that
configuration.
Eckhart Koppen [Fri, 13 May 2011 12:52:30 +0000 (15:52 +0300)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-staging
Eckhart Koppen [Fri, 13 May 2011 12:38:50 +0000 (15:38 +0300)]
Updated version references in autotests
Tests now refer to version 5.0.0
Eckhart Koppen [Fri, 13 May 2011 12:38:00 +0000 (15:38 +0300)]
Updated default Qt version to 5.0.0
Changed default version in qbase.pri and qpluginbase.pri in case no
version is given at all.
Eckhart Koppen [Fri, 13 May 2011 10:47:56 +0000 (13:47 +0300)]
Removed deprecated functions in QList
Removed detach, detach2, detach3 and append which were marked
as required only up to 4.5.x
Eckhart Koppen [Fri, 13 May 2011 10:22:30 +0000 (13:22 +0300)]
Updated Qt and QtBase module version number to 5.0.0
Updated version in qglobal.h as well as the module version itself
Eckhart Koppen [Fri, 13 May 2011 10:15:04 +0000 (13:15 +0300)]
Updated data stream version for Qt 4.9 and 5.0
For now, using the same version as 4.8. This needs to be corrected
when the actual data stream version is known.
Qt Continuous Integration System [Fri, 13 May 2011 09:19:33 +0000 (19:19 +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_moc: remove QtSvg dependency
Olivier Goffart [Fri, 13 May 2011 09:11:55 +0000 (11:11 +0200)]
tst_moc: remove QtSvg dependency
The test for no keyword of every header should be done by the
tst_CompilerWarnings test
Qt Continuous Integration System [Fri, 13 May 2011 07:31:10 +0000 (17:31 +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 deadlocks in wayland clipboard that can occur in special scenarios.
Laszlo Agocs [Thu, 12 May 2011 14:20:03 +0000 (16:20 +0200)]
Fix deadlocks in wayland clipboard that can occur in special scenarios.
setMimeData() emits the changed signal always so to prevent duplicated
signals keyboardFocus() must only emit when the change came from
another wayland client. However direct connection may cause issues
when invoking the slot from a wayland callback, so use a metacall
to make sure we return from the callback. Unnecessary data transfer
and potential deadlock is now also avoided when a client is requesting
the mime data from itself.
Reviewed-by: Jørgen Lind
Qt Continuous Integration System [Fri, 13 May 2011 01:48:59 +0000 (11:48 +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 error checking in QSignalSpy consistent
Jason McDonald [Fri, 13 May 2011 00:42:41 +0000 (10:42 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Jason McDonald [Thu, 12 May 2011 07:23:14 +0000 (17:23 +1000)]
Make error checking in QSignalSpy consistent
QSignalSpy's constructor failed gracefully for some problems with the
parameters, but not for null parameters, for which there was only a
Q_ASSERT. This commit makes the handling of null parameters consistent
with the handling of other errors -- output a meaningful error message
with qWarning() and return, so that isValid() will subsequently return
false.
Change-Id: I7f5677a4c10185e30403ce3e12a022de8c13bc1c
Task-number: QTBUG-14283
Reviewed-by: Rohan McGovern
Qt Continuous Integration System [Thu, 12 May 2011 23:47:50 +0000 (09:47 +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: add bug numbers to a few FIXMEs
Rohan McGovern [Thu, 12 May 2011 23:14:09 +0000 (09:14 +1000)]
tests: add bug numbers to a few FIXMEs
Change-Id: Idd01ce127859516dbab10644b97b281cb5218720
Qt Continuous Integration System [Thu, 12 May 2011 23:05:00 +0000 (09:05 +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:
Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile
Rohan McGovern [Thu, 12 May 2011 07:45:55 +0000 (17:45 +1000)]
Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile
Recursive QMAKE_EXTRA_TARGETS were omitting the `-f' option to make.
This would break in the case where the correct makefile was not named
`Makefile'. The included autotest demonstrates the problem.
Note that this was fixed for normal targets back in 2005
by
faac7bd178654fd67a6f3f9cf4f6f2605071448d (p4 202370), but was not
fixed for extra targets.
Reviewed-by: ossi
(cherry picked from commit
96a3bf7a8bbc1e5361e16cbeeceb4be674b88c30)
Qt Continuous Integration System [Thu, 12 May 2011 20:58:29 +0000 (06: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:
fix compilation with namespaces
Lars Knoll [Thu, 12 May 2011 17:00:15 +0000 (19:00 +0200)]
fix compilation with namespaces
Reviewed-by: Bjørn Erik Nilsen
(cherry picked from commit
7a1c29f101b95c9cc2cb53f8b80d231b5a994a9a)
Qt Continuous Integration System [Thu, 12 May 2011 15:11:57 +0000 (01:11 +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 compilation with namespaces enabled
Lars Knoll [Thu, 12 May 2011 14:21:03 +0000 (16:21 +0200)]
Fix compilation with namespaces enabled
Reviewed-by: Samuel Rødal
(cherry picked from commit
bff68fc7094a50af57f7da23ecf9b25cab00f188)
Qt Continuous Integration System [Thu, 12 May 2011 14:03:52 +0000 (00: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:
Make QLineControl send accessibility updates.
Revert "Fix double painting when adding an item into a linear layout"
Fix licence headers again for MR 900
Improve invalidate() testcase.
Avoid flicker when invalidate is propagated in a widget/layout hierarchy
Fix licence headers again for MR 900
Frederik Gladhorn [Tue, 26 Apr 2011 16:41:15 +0000 (18:41 +0200)]
Make QLineControl send accessibility updates.
To make it emit the signals for the right object, it needs its parent to
be the QGraphicsItem/SGItem/QLineEdit.
According to IA2 it should emit TextUpdated and CursorMoved signals.
TextChanged is deprecated.
More fine grained signals would be desireable but this makes changes work at all.
Reviewed-by: Morten Sorvig
Jan-Arve Sæther [Thu, 28 Apr 2011 11:58:12 +0000 (13:58 +0200)]
Revert "Fix double painting when adding an item into a linear layout"
(It did not really fix the issue.)
This reverts commit
33f525e636ef8fa64a15d3e66c56adaea0075bda.
Conflicts:
src/gui/graphicsview/qgraphicslinearlayout.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
(cherry picked from commit
fee052e3e37b3335fe563cb8a1881bf59f9e25d0)
Sergio Ahumada [Thu, 14 Apr 2011 13:30:34 +0000 (15:30 +0200)]
Fix licence headers again for MR 900
See commit
b00089261eafbdf5f92ed94d7fb20b402bfcaeb2
Reviewed-by: Gabriel de Dietrich
(cherry picked from commit
bc16ebdb7aeff70fe8149297183636ea7fd14ed1)
Jan-Arve Sæther [Fri, 18 Mar 2011 09:52:03 +0000 (10:52 +0100)]
Improve invalidate() testcase.
Test number of:
* events
* setGeometry() calls
* invalidate() calls
(cherry picked from commit
b8b4e6fe141d99c4639d492a546226cdc3fc06c5)
Jan-Arve Sæther [Wed, 9 Feb 2011 14:07:24 +0000 (15:07 +0100)]
Avoid flicker when invalidate is propagated in a widget/layout hierarchy
* Do not call invalidate from activateRecursive().
This resulted in that a layout was invalidated as many times as there
were items in the layout.
* Several improvements. Do not call resize(size()) too often.
Calling resize() from the widgetEvent() is not very nice though...
* Remove commented out code
* make sure layout is activated even if the widget does not change size
* activate the layout if the resize is same as size()
* In order to not break existing apps, make this an opt-in feature
with QGraphicsLayout::setInstantInvalidatePropagation(true);
Reviewed-by: Frederik Gladhorn
Reviewed-by: John Tapsell
Gabriel de Dietrich [Thu, 14 Apr 2011 11:58:25 +0000 (13:58 +0200)]
Fix licence headers again for MR 900
See commit
b00089261eafbdf5f92ed94d7fb20b402bfcaeb2
Reviewed-by: Trust me
(cherry picked from commit
7b6a7f475119878681c9d0c06b29896ec3fe72c3)
Qt Continuous Integration System [Thu, 12 May 2011 08:54:44 +0000 (18:54 +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 algorithm for drawing thin lines
Lars Knoll [Thu, 14 Apr 2011 19:38:45 +0000 (21:38 +0200)]
New algorithm for drawing thin lines
Added a new QCosmeticStroker class for drawing thin
lines. The class can handle both aliased and antialiased
lines.
The code replaces all the midpoint line drawing algorithms in
the raster paintengine and gives correct subpixel positioning
for lines.
It gives around 30% to 50% speedup against the midpoint algorithm. If
we missed that fast path, the speedup is around between a factor of
6 to 8 for lines and aliased paths and 100 and 400 for antialiased
paths.
Reviewed-by: Kim
(cherry picked from commit
37c329a3e35fabc88fbcad824a69f37c671d2132)
Qt Continuous Integration System [Wed, 11 May 2011 16:11:15 +0000 (02:11 +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:
Prevent crash in OpenGL engine when scaling images / pixmaps.
Qt Continuous Integration System [Wed, 11 May 2011 15:42:31 +0000 (01: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:
Add the QIdentityProxyModel.
Stephen Kelly [Wed, 10 Nov 2010 10:21:53 +0000 (11:21 +0100)]
Add the QIdentityProxyModel.
Older commit history is in KDE svn:
http://websvn.kde.org/trunk/KDE/kdelibs/kdeui/itemviews/kidentityproxymodel.cpp?view=log
Ammended to update the license headers.
Merge-request: 900
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
Conflicts:
doc/src/frameworks-technologies/model-view-programming.qdoc
tests/auto/headers/tst_headers.cpp
(cherry picked from
b00089261eafbdf5f92ed94d7fb20b402bfcaeb2)
Samuel Rødal [Wed, 11 May 2011 15:34:12 +0000 (17:34 +0200)]
Prevent crash in OpenGL engine when scaling images / pixmaps.
Make sure the resulting image / pixmap is valid if the source was valid.
Task-number: QTBUG-19157
Reviewed-by: Kim
Reviewed-by: Benjamin Poulain
(cherry picked from commit
1c5da7207a21cc44a4a08d291c290ffcd9b958fd)
Qt Continuous Integration System [Wed, 11 May 2011 14:49:55 +0000 (00:49 +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:
update def files
emit QNetWorkAccessManager::finished on QNetworkReply::abort()
Don't run XLib check if -no-gui is used
don't ignore create_prl for static plugins
make QLibraryInfo return clean paths
make relative paths in qt.conf work inside qmake
Sockets: Fix potential null pointer usages
QNAM: Re-order checks in migrateBackend()
Fix initial main window dimensions for "fullscreen with softkeys" case
Fix spelling mistake
Fixes crash in QWidget::effectiveWinId.
Fix crash when QSocketNotifier used with an invalid descriptor
Optimisation - buffer packet read in pendingDatagramSize
Remove warnings when disabling notifications on a closed socket
Fix some warnings in symbian network tests
Shane Kearns [Tue, 10 May 2011 12:11:45 +0000 (13:11 +0100)]
update def files
Reviewed-by: Trust Me
(cherry picked from commit
84cf56543c3e9add4f06ed65cf419561117ee739)
Martin Petersson [Mon, 9 May 2011 11:56:47 +0000 (13:56 +0200)]
emit QNetWorkAccessManager::finished on QNetworkReply::abort()
If we can not get online when the request is made then we are in the
WaitingForSession state. This will happen for example if the device
is in flight mode. This fix follows the same logic as in
_q_networkSessionFailed, but we should look into why we have the
WaitingForSession check in finished().
Task-number: QT-4747
Reviewed-by: Markus Goetz
(cherry picked from commit
0c9cb9a34d6b472cb53bf1af4616af55b593b616)
Bernhard Rosenkraenzer [Mon, 9 May 2011 09:34:17 +0000 (11:34 +0200)]
Don't run XLib check if -no-gui is used
Currently, an attempt to compile Qt even with -no-gui on a Linux box
that doesn't have libX11 installed fails becaue of the XLib
functionality check in configure.
This check can be turned off in -no-gui mode, since QtCore, QtXml,
QtNetwork and friends don't use libX11.
Merge-request: 1214
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
912b6804bcacbf1b4f356d947986df8156a545a4)
Oswald Buddenhagen [Wed, 20 Apr 2011 17:47:49 +0000 (19:47 +0200)]
don't ignore create_prl for static plugins
Task-number: QTBUG-18436
Reviewed-by: joerg
(cherry picked from commit
2ca4ce848c63c9fa0a48c0f9f4e7fdbc90463bf1)
Oswald Buddenhagen [Wed, 20 Apr 2011 14:28:58 +0000 (16:28 +0200)]
make QLibraryInfo return clean paths
as a side effect, don't use QDir for path resolution - it doesn't buy us
anything.
Task-number: QTBUG-1371
Reviewed-by: joerg
(cherry picked from commit
9cd62e4f7b23894a672297f6eebda64cdbd53cb0)
Oswald Buddenhagen [Wed, 20 Apr 2011 14:27:55 +0000 (16:27 +0200)]
make relative paths in qt.conf work inside qmake
Task-number: QTBUG-11602
Reviewed-by: joerg
(cherry picked from commit
e6bb6ba76942d98e4b50a7fd32bf44e211f2fa5e)
Shane Kearns [Thu, 5 May 2011 15:32:11 +0000 (16:32 +0100)]
Sockets: Fix potential null pointer usages
QAbstractSocketEngine::createSocketEngine can return 0 as well as throw.
In two cases the pointer was being used before the null check, in a 3rd
case the null check was missing.
Reviewed-by: Markus Goetz
(cherry picked from commit
19edac88af53eea7f733cabbaee77f9b725b7ea9)