Olivier Goffart [Thu, 3 Nov 2011 13:11:34 +0000 (14:11 +0100)]
QThread::isFinished should return true from finished()
and isRunning() should return false.
This restore the Qt 4.7 behaviour
In Qt 4.7, the finished() was called with the thread's intenal mutex
locked. Which mean that:
- Call to isRunning or isFinished called from a slot connected to
finish within the thread would deadlock. (Hence no compatibility
to keep here)
- Call to isRunning or isFinished from a slot connected with
QueuedConnection in another thread would lock the mutex until
the destructors are finished. and then return as if the thread have
finished.
Change-Id: I963eccae8f7634aff90cc4bbab6ca886a78e35eb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Olivier Goffart [Wed, 26 Oct 2011 18:25:35 +0000 (20:25 +0200)]
Enable deprecated feature for now
Rationale is that it makes it possible to deprecate functions without
breaking other modules.
After the feature freeze, this should be reset to 5
Notice that QT_DEPRECATED is not defined while bootstrapping Qt
(QT_NO_DEPRECATED defined)
This also means that compilation is tested
Change-Id: I85f0e65ac3a160e9aba3833787ded3f94304cb90
Reviewed-by: David Faure <faure@kde.org>
Pekka Vuorela [Wed, 2 Nov 2011 11:30:38 +0000 (13:30 +0200)]
Renamed QTextLayout member variable for readability
Class complex enough already without int i as member variable.
Furthermore, some methods use loop variable with same name, shadowing
the member one.
Change-Id: Idf2f5e34f130a60eb6121480e596e443f23641dd
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Pekka Vuorela [Wed, 2 Nov 2011 08:53:09 +0000 (10:53 +0200)]
Documented side-effect of QTextLayout::setPreeditArea()
Invalidates layout and requires layouting again.
Change-Id: I1cb954f155e4fc1df4b217478998ac903cc18323
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Harald Fernengel [Wed, 2 Nov 2011 23:42:32 +0000 (00:42 +0100)]
Fix regular expression when replacing headers
Use non-greedy capturing where it makes sense, also
keep the user's whitespace indentation in his include statements
Change-Id: Iff2b5dabf443529292e943ae69427bd15e702bf9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Jason McDonald [Thu, 3 Nov 2011 05:07:09 +0000 (15:07 +1000)]
Remove empty functions from QDirModel test.
Change-Id: Ieb8af41425739f9175df26224b171cd9f8b3c4f3
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Tue, 1 Nov 2011 01:34:09 +0000 (11:34 +1000)]
Improve QDirModel autotest
The unreadable() test function has been disabled since before the tests
were imported into the Qt repository. The idea of the test seems valid
(though the original implementation failed to correctly create an
unreadable file), so it should be re-enabled.
Change-Id: I94634bc5785dfbfbb42ca975badaead7fe812b29
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Wed, 2 Nov 2011 08:39:20 +0000 (18:39 +1000)]
Fix getting of enviroment strings in testlib
The standard C getenv() returns NULL if the requested environment
variable is not found.
In Qt4 and later, qgetenv() does not return a null pointer if the
requested environment string is not defined. Instead it returns a
QByteArray containing an empty string. If using qgetenv(), there is no
way to tell the difference between an undefined environment variable
and one which is defined to be the empty string.
In testlib, all calls to qgetenv() were checking whether the returned
QByteArray's constData() returned a null pointer, but that would never
happen. These calls must instead check whether the QByteArray contains
a non-empty string.
Change-Id: I342f0e8b196896c26cccce3ff169fa1b9669b5ff
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Fri, 28 Oct 2011 08:19:05 +0000 (18:19 +1000)]
Allow extra selftests without modifying source.
Change-Id: I21708b725611eb64bdb0414cee08ca00dd62b213
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Samuel Rødal [Tue, 1 Nov 2011 07:12:07 +0000 (08:12 +0100)]
Get rid of "#if 0" and skipped tests in QPainter autotest.
qt_format_text_clip() and qt_format_text_boundingrect() have been
skipped ever since they were originally added to git, so I see no point
in keeping them.
The #if 0 in setEqualClipRegionAndPath() was ifdefed out from when that
specific test case was added (maybe it was failing to begin with?), but
it passes now, so we should enable it.
Change-Id: I6551e3b5612a4d4b00a969511af6abc85db43892
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
David Faure [Wed, 2 Nov 2011 17:15:37 +0000 (18:15 +0100)]
QStandardPaths: fix encoding of XDG_CONFIG_HOME env var
Change-Id: Ibb89f204fc93aed5a669f8f9efc7859845e6d493
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Jo Asplin [Mon, 31 Oct 2011 08:33:35 +0000 (09:33 +0100)]
Re-enabled passing tests in tst_qgraphicsitem
To increase the effective test coverage, this patch
re-enables the tst_qgraphicsitem test case as such, and
instead disables only the test functions that are currently
failing in CI.
Task-number: QTBUG-22453
Change-Id: If311bc61801d2a279c274928ae7f0faeb595eeb3
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Jo Asplin [Mon, 31 Oct 2011 09:25:35 +0000 (10:25 +0100)]
Re-enabled passing tests in tst_qgraphicsview
To increase the effective test coverage, this patch
re-enables the tst_qgraphicsview test case as such, and
instead disables only the test functions that are currently
failing in CI.
Task-number: QTBUG-22453
Change-Id: I6b8eb09000ece789b990a2dd697cdb8b47cc8e1c
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Jo Asplin [Mon, 31 Oct 2011 09:45:11 +0000 (10:45 +0100)]
Re-enabled passing tests in tst_qgraphicsscene
To increase the effective test coverage, this patch
re-enables the tst_qgraphicsscene test case as such, and
instead disables only the test functions that are currently
failing in CI.
Task-number: QTBUG-22453
Change-Id: Idd229532787ce8138d8e1c86daf1f91b90e87e38
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Jo Asplin [Tue, 1 Nov 2011 13:04:01 +0000 (14:04 +0100)]
Moved tests into network/ssl/
This commit moves qsslsocket_onDemandCertificates_member and
qsslsocket_onDemandCertificates_static from tests/auto/ to
tests/auto/network/ssl/.
Change-Id: I1593e113016ce7bb7dffbee82f1196275784d0ac
Reviewed-by: Holger Ihrig <holger.ihrig@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Thomas Hartmann [Wed, 2 Nov 2011 11:33:30 +0000 (12:33 +0100)]
Adding custom bezier easing curves to QEasingCurve
I added the possibilty to define Bezier/TCB splines and use them
as custom easing curves.
Note:
Splines have a parametric definition. This means we have a
function/polynom of t that evalutes to x and y. x/y = f(t).
For our purpose we actually need the function y = f(x).
So as a first step we have to solve the solution x = f(t) for a given
t and then in a second step we evaluate y = f(t).
f(t) is a cubic polynom so we use cardanos formula to solve this equation
directly.
For the casus irreducibilis we need 3 functions that are a combination of
arcos and cos. Instead of evaluating arcos and cos we approximate these
functions directly.
TCB splines are converted into the corresponding cubic bezier spline.
Change-Id: Id2afc15efac92e494d6358dc2e11f94e8c524da1
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Friedemann Kleint [Wed, 2 Nov 2011 09:58:06 +0000 (10:58 +0100)]
Windows platform plugin: Fix compiler warnings.
Change-Id: Id7111ca74455b93aabb803babff51c4393508dbc
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
Olivier Goffart [Wed, 2 Nov 2011 09:26:50 +0000 (10:26 +0100)]
Use C++11 static_assert
Change-Id: I75aa2bc209cdc8869e7daa9fd0dd865ccf65a68e
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Olivier Goffart <ogoffart@kde.org>
Bradley T. Hughes [Mon, 31 Oct 2011 15:02:37 +0000 (16:02 +0100)]
Silence warning from clang: semicolon before method body is ignored
qnsview.mm:171:45: warning: semicolon before method body is ignored
[-Wsemicolon-before-method-body]
- (void)handleMouseEvent:(NSEvent *)theEvent;
^
Change-Id: I0b2fdd9c28586ce03f14f784d35e88dbbb5bd8f4
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Bradley T. Hughes [Tue, 1 Nov 2011 12:45:01 +0000 (13:45 +0100)]
Disable warnings while building QtV8
This is a 3rd-party submodule that we do not directly modify. Warnings
from this code is of no value to people diagnosing and fixing warnings
in Qt code itself.
Change-Id: If17d9ce6509abb7d7aa1f00daf7e771fc6231993
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Friedemann Kleint [Tue, 1 Nov 2011 07:42:14 +0000 (08:42 +0100)]
Testlib: Remove remains of qpa.
Link ApplicationServices in the non-qpa case (CoreServices
present).
Change-Id: I7555243aa480a7a4db84731a797924a97bf200cd
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Jason McDonald [Tue, 1 Nov 2011 06:45:36 +0000 (16:45 +1000)]
Reinstate disabled part of qsortfilterproxymodel test
This test function has been disabled since before the tests were
imported into the Qt repository in 2006, but seems to pass today, at
least on Linux.
Change-Id: I8ff90a11a0fbb260d66b20ae735b5f21c450a5af
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Tue, 1 Nov 2011 05:59:40 +0000 (15:59 +1000)]
Remove stale test data from qsortfilterproxymodel test
The removed test data has been disabled since before the tests were
added to the Qt repository in June 2006, and was incomplete (the
"pattern" field was missing).
Change-Id: I974d03a4dcca76ba1a20f740372702612c8ce02b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Tue, 1 Nov 2011 05:52:34 +0000 (15:52 +1000)]
Remove disabled code from QWidget autotest.
The removed code was already disabled when first committed in January
2009.
Change-Id: I00a82f2e673fee76869cc76d756c36d081da2d2a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Tue, 1 Nov 2011 05:33:12 +0000 (15:33 +1000)]
Remove disabled code from qgridlayout autotest
The removed code was already disabled when it was first added in June
2006, and is based on assumptions that no longer hold true.
Change-Id: Id7941d46e2a993aac422554dcc5540eb64eac492
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Tue, 1 Nov 2011 04:40:32 +0000 (14:40 +1000)]
Remove disabled test data from QUrl autotest
The removed test data was for obex URLs, which are not supported by
QUrl.
Change-Id: I166130ae936342d415165e46b7943d198de8986b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Tue, 1 Nov 2011 03:57:04 +0000 (13:57 +1000)]
Remove redundant #if 1 from qdbusmarshall test
Change-Id: I5342210cda1f02950667621e5e64d65d6357c6ce
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Tue, 1 Nov 2011 03:53:11 +0000 (13:53 +1000)]
Remove redundant code from qsortfilterproxymodel test
Remove a couple of "#if 1" directives (but not their contents), which
have been present since before the tests were imported into the Qt
repository in 2006.
Change-Id: Id43aff37843e7a44ed96973f809de3838ba0e5b9
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Tue, 1 Nov 2011 03:48:33 +0000 (13:48 +1000)]
Improve QWidget autotest.
Remove some "#if 1" directives and a line of debug code.
Change-Id: Ib34f5b65470a24ee499799525ffe0645ccc117fe
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Tue, 1 Nov 2011 03:17:43 +0000 (13:17 +1000)]
Remove debugging code from qgraphicsitem autotest.
Change-Id: Ia2ff65b5e980b42c5c64b957143860e94395d54f
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Tue, 1 Nov 2011 02:48:12 +0000 (12:48 +1000)]
Remove unused code from qdbusmarshall test.
The removed functions have been unsued since at least as far back as
2006.
Change-Id: Id1ea77dbfffa319c18891968f3aa378cfb563fd4
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Tue, 1 Nov 2011 02:45:40 +0000 (12:45 +1000)]
Remove obsolete code from qdbusmarshall test.
The removed code had been disabled since 2007 and tested functionality
that was no longer supported.
Change-Id: I49dfe58601c1cc6d41590ab2980daba27eca6bfb
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Tue, 1 Nov 2011 02:14:24 +0000 (12:14 +1000)]
Remove obsolete code from qdbuspendingcall test
The tested functionality hasn't been in the public API since 2008.
Change-Id: I2898da3730fa6248eea2e19779b33ccc793b7a31
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Tue, 1 Nov 2011 01:52:29 +0000 (11:52 +1000)]
Remove disabled code in QItemView test.
The removed code was disabled in January 2007. The commit history does
not make clear what the code was supposed to achieve and the code
doesn't do what the comment at the top says (that looks like a TODO).
Best to delete it and start again.
Change-Id: I42b6b1d865c96518d74dc189a4a41d0d2776e5bc
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Bradley T. Hughes [Tue, 1 Nov 2011 12:53:13 +0000 (13:53 +0100)]
Silence warning from clang
The original intent was most likely to memset() the entire MD5Context to
zero at the end of MD5Final(), which we do now.
In file included from tools/qcryptographichash.cpp:49:
...qtbase/src/corelib/../../include/QtCore/../../src/corelib/tools/../../3rdparty/md5/md5.cpp:139:24:
warning:
argument to 'sizeof' in 'memset' call is the same expression as
the
destination; did you mean to dereference it? [-Wsizeof-pointer-
memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
~~~ ^~~
Change-Id: I793c6f0944b89c0e4c5f9253cdb1071175c17152
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Casper van Donderen [Mon, 31 Oct 2011 09:52:37 +0000 (10:52 +0100)]
Remove test that hasn't been enabled since 2007.
Task-number: QTBUG-22444
Change-Id: Id7569cf60cb314511a7d4f38833913c442f3fbba
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Friedemann Kleint [Tue, 1 Nov 2011 14:07:31 +0000 (15:07 +0100)]
Remove remains of qpa in tests.
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Change-Id: I41aed5290df5aebeb30ebf5d2796aca6c65980d1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Jędrzej Nowacki [Tue, 1 Nov 2011 13:41:10 +0000 (14:41 +0100)]
Fix broken build.
Variadic macros are not supported by C++98 standard.
Change-Id: Ib520297e43b654b46925f3ee2735a975ebbe8e35
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Samuel Rødal [Mon, 31 Oct 2011 15:02:42 +0000 (16:02 +0100)]
Add Q_PROPERTY declarations to QScreen.
This means we can expose the API to QML in a simple way.
Change-Id: Ibc36711071d288ed78ce833a64d6be2f22fc4b62
Reviewed-by: Leonardo Sobral Cunha <leo.cunha@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Bradley T. Hughes [Fri, 28 Oct 2011 18:10:32 +0000 (20:10 +0200)]
Tentatively keep operator=(const QAtomic* &other)
QAtomic* has a copy constructor, so it may make sense to allow
assignment of one atomic variable to another.
Change-Id: Ic754d13765080e2fcd13dc583940e354ad4404cd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Friedemann Kleint [Tue, 1 Nov 2011 10:50:42 +0000 (11:50 +0100)]
qeventdispatcher_win: Fix warnings about QAtomicInt.
Change-Id: I2639fcee046ad3cc5de9c2635fdb6de4b757fc27
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Jo Asplin [Mon, 31 Oct 2011 10:52:32 +0000 (11:52 +0100)]
Re-enabled passing tests in tst_qgraphicswidget
To increase the effective test coverage, this patch
re-enables the tst_qgraphicswidget test case as such, and
instead disables only the test functions that are currently
failing in CI.
Task-number: QTBUG-22453
Change-Id: Ic484fde3492f077453f47a959dd6dc862288dcaf
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Olivier Goffart [Tue, 1 Nov 2011 10:24:10 +0000 (11:24 +0100)]
tst_qvariant: add a test QVariant works with not movable types
Soon, QVariant will use more internal storage. It is important
that it still work with not movable types
Also, check with type that are movable but cannot be copyed
without their copy constructor to be called such as QSharedDataPointer
Change-Id: I6d67755476e4822468599bebfa8774ad96a15306
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Sergio Ahumada [Mon, 31 Oct 2011 14:17:39 +0000 (15:17 +0100)]
Revert "Fix use of qMax() with floating point constants"
This reverts commit
4e1b8720c1498edbb7a5bd37f622fdd3feb07850
Change-Id: I5e52a86119b522888b69fa261ebfa9168f885864
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Bradley T. Hughes [Fri, 28 Oct 2011 18:05:34 +0000 (20:05 +0200)]
Append -W* configure flags to QMAKE_C*FLAGS_WARN_ON
... instead of adding them to all C*FLAGS. This makes it
possible to pass -Wno-warning-name to configure to disable
certain warnings enabled by default (which didn't work
previously). This also has the added benefit that only projects
that have CONFIG+=warn_on will get the extra warning flags.
Change-Id: I7bbc100155e02e7ccb9ac3be14bd8f585b7bc39b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Jason McDonald [Mon, 31 Oct 2011 07:48:38 +0000 (17:48 +1000)]
Remove debug code from qsortfilterproxymodel test
Any test diagnostics that are useful should be part of the regular test
output, as the CI system cannot switch on commented-out code when there
is a test failure.
Change-Id: I80691b274d9d2abda72bca894ace9de545410ed8
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Mon, 31 Oct 2011 07:44:11 +0000 (17:44 +1000)]
Improve QWidget autotest
There are two cases where a QCOMPARE may fail on some platforms. Rather
than disabling the QCOMPAREs with "#if 0", use QEXPECT_FAIL so that we
can look in the CI logs to see which platforms fail.
Change-Id: Ife93c8032e01a04e8068bf213e2040778c12f711
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Mon, 31 Oct 2011 07:33:42 +0000 (17:33 +1000)]
Remove debug code from QLayout autotest.
Any test diagnostics that are useful should be part of the regular test
output, as the CI system cannot switch on commented-out code when there
is a test failure.
Change-Id: Id4efb74a2d3646f3554b643762beefba113c3602
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Mon, 31 Oct 2011 07:32:21 +0000 (17:32 +1000)]
Remove debug code from QGridLayout autotest
Any test diagnostics that are useful should be part of the regular test
output, as the CI system cannot switch on commented-out code when there
is a test failure.
Change-Id: Ifd2bbd17677e16ddb0f1846287d722cdae76d984
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Mon, 31 Oct 2011 07:28:36 +0000 (17:28 +1000)]
Remove obsolete test.
The commit that disabled this test a few days after it was originally
comitted (
bda80c4b in the grafted history) makes it clear that this
test was never valid.
Change-Id: Ib0090fc35d0b9251d7b7367de2c71a66a332c567
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Mon, 31 Oct 2011 07:12:11 +0000 (17:12 +1000)]
Improve QMenu autotest.
Originally this commit was just going to reinstate the disabled line of
test data (after correcting it to use keyboard modifiers instead of
invalid bitwise-or of key-codes, which would trigger an assert in
qtestlib). Unfortunately, this revealed a minor bug in QMenu, as
reported in QTBUG-22449, so a QEXPECT_FAIL has also been added.
Change-Id: I29699fcbfa353c037a83379a6140f0e3da5be027
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Liang Qi [Mon, 31 Oct 2011 12:44:01 +0000 (13:44 +0100)]
Remove S60/symbian specific code in plugins/bearer
Clean up and remove Symbian specific code and data.
Change-Id: Icef41c22f143278a66f6a46ca80c495d083bf9a9
Reviewed-by: Alex <alex.blasche@nokia.com>
Bradley T. Hughes [Mon, 31 Oct 2011 11:35:12 +0000 (12:35 +0100)]
Use QAtomicInt::store() instead of operator=(int)
... since the latter is now deprecated and will be removed.
Change-Id: I456c1bf93ebf119c028bc4a63f1f8a31f069b83b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Lars Knoll [Mon, 31 Oct 2011 09:16:15 +0000 (10:16 +0100)]
Fixes to the ibus input context
Adjust to changes in the QPlatformInputContext
and implement commit(). Fix a bug that caused the
cursor to be hidden after the first commit.
Change-Id: I85e59a72766d1180a54df412cf33beb653af4e7b
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Liang Qi [Mon, 31 Oct 2011 12:34:01 +0000 (13:34 +0100)]
Remove S60/symbian specific mkspec
Clean up and remove Symbian specific mkspec.
Change-Id: I0fa75287720db92983422611e0090301d06814ec
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Liang Qi [Mon, 31 Oct 2011 12:39:25 +0000 (13:39 +0100)]
Remove S60/symbian specific code in corelib/arch
Clean up and remove Symbian specific code and
data.
Change-Id: I41794085fd5122310b1fdf4c524c6e77d22e8500
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Jason McDonald [Mon, 31 Oct 2011 06:36:42 +0000 (16:36 +1000)]
Improve QMenu autotest
The test for keyboard navigation was only checking correct highlighting
when a menu item was not activated by the latest key-click. It should
also check that no item is highlighted after an item is activated.
Change-Id: I443e154be5cdc2def4f12d3f0abab2cc1bc6e4a8
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Shane Kearns [Wed, 26 Oct 2011 13:45:50 +0000 (14:45 +0100)]
HTTP proxy engine - accept standard Connection header
The Proxy-Connection header is a non standard header, but is widely
used so forming a de-facto standard.
Some proxies use the official Connection header, so we should check
for that in responses. Otherwise https connections over http proxy
fail in case the proxy sends "Connection: close" with the 407 reply.
Task-number: QTBUG-22177
Change-Id: If6cfa4ebb7ac9d97d65b6ddcc8257aee20ac0448
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Peter Hartmann [Mon, 31 Oct 2011 15:49:46 +0000 (16:49 +0100)]
SSL documentation: correct enum name
(cherry picked from commit
9d5c920bb23b949a0b98f1268679a0a2c06dd1d9)
Change-Id: Id99040051afe97bca3b1a8e4e3ae5a4c7f617cc9
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
Friedemann Kleint [Fri, 28 Oct 2011 08:43:07 +0000 (10:43 +0200)]
mkspecs: Remove qpa conditionals.
Preparing removal of -qpa from configure.
Change-Id: Id2f784206f97729c739cf20504a2a9428ddc1cce
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Casper van Donderen [Mon, 31 Oct 2011 09:41:13 +0000 (10:41 +0100)]
Update enums in documentation.
Change-Id: Ic48051cc832dc8bc06df2e82c54388df60208e39
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Bradley T. Hughes [Mon, 31 Oct 2011 13:48:33 +0000 (14:48 +0100)]
Reimplement GLTexture::failed() properly in GLRenderTargetCube
The GLRenderTargetCube::failed() method needs to be const.
Change-Id: I9bfa031e284b62c86a9be786aea3b851582b71f4
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Casper van Donderen [Mon, 31 Oct 2011 09:40:31 +0000 (10:40 +0100)]
Add file from qtdoc.
Change-Id: I0e76b1eb0195a621ca3888e2194bdd7fd10f6251
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Robin Burchell [Sun, 23 Oct 2011 18:06:18 +0000 (20:06 +0200)]
Remove Symbian support from bind enum documentation.
Symbian is no longer a supported platform.
Change-Id: Ifcb2e05661b16acc6307a4ccfaa42586750734c1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Robin Burchell [Sun, 23 Oct 2011 18:04:52 +0000 (20:04 +0200)]
Move support for socket binding from QUdpSocket upstream to QAbstractSocket.
This should be API-compatible with Qt 4, but is not ABI-compatible, due to
removing the enum from QUdpSocket.
Task-number: QTBUG-121
Change-Id: I967968c6cb6f96d3ab1d6300eadd5bde6154b300
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Robin Burchell [Mon, 24 Oct 2011 16:36:23 +0000 (18:36 +0200)]
Set localAddress and localPort on socket binding.
This should have always been the case, as it simply makes sense, but the
upcoming moving of binding to QAbstractSocket will require this for autotesting.
Change-Id: Ieef70196616227e7914c76fff5388a4068c36efb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Bradley T. Hughes [Mon, 31 Oct 2011 13:58:56 +0000 (14:58 +0100)]
Remove declaration of QRasterPlatformPixmap::fromFile()
This function is not implemented, and the declaration hides the virtual
QPlatformPixtmap::fromFile():
../../include/QtGui/5.0.0/QtGui/private/../../../../../src/gui/image/qpixmap_raster_p.h:70:10:
warning:
'QRasterPlatformPixmap::fromFile' hides overloaded virtual function
[-Woverloaded-virtual]
void fromFile(const QString &filename, Qt::ImageConversionFlags flags);
^
../../include/QtGui/../../src/gui/image/qplatformpixmap_qpa.h:90:18:
note:
hidden overloaded virtual function 'QPlatformPixmap::fromFile' declared
here
virtual bool fromFile(const QString &filename, const char *format,
^
Change-Id: Iedbc4acd9f9218f8fe72a44a9eff6a35b5494d75
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Bradley T. Hughes [Mon, 31 Oct 2011 13:10:52 +0000 (14:10 +0100)]
Move QPrinter::init() to QPrinterPrivate::init()
This method is private, and only called from the QPrinter constructor.
This also removes warnings about overloading the virtual
QPaintDevice::init() method interitted form QWidget:
../../include/QtPrintSupport/../../src/printsupport/kernel/qprinter.h:259:10:
warning:
'QPrinter::init' hides overloaded virtual function [-Woverloaded-
void init(PrinterMode mode);
^
../../include/QtGui/../../src/gui/painting/qpaintdevice.h:93:18: note:
hidden
overloaded virtual function 'QPaintDevice::init' declared here
virtual void init(QPainter *painter) const;
^
Change-Id: I7c5203a1264b0ad825ed4075b66017fef22a40fb
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: David Faure <faure@kde.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Olivier Goffart <ogoffart@kde.org>
Sergio Ahumada [Sun, 30 Oct 2011 16:34:46 +0000 (17:34 +0100)]
Doc: Fixing typos
Change-Id: I445b4cb0fe88d775c9421fbf1e8b7bb76dec0fc4
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Samuel Rødal [Mon, 24 Oct 2011 12:35:50 +0000 (14:35 +0200)]
Re-added hellogl_es and ES 1 support for QOpenGLContext.
Change-Id: I576cf3595cdeeefb4ed840bb3b2b7097b3609cc7
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Olivier Goffart [Thu, 20 Oct 2011 15:11:18 +0000 (17:11 +0200)]
QRecursiveMutexPrivate should not inherit from QMutexPrivate
QMutexPrivate takes more memory than necessary, and also initialize
platform specific ressources.
Change-Id: I70be1b89b1c21499645785ae47693a6b2514e28b
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Olivier Goffart [Fri, 28 Oct 2011 09:51:06 +0000 (11:51 +0200)]
Rename QBasicMutex::d to QBasicMutex::d_ptr
Because we use d as a local variable.
We used this->d to refer it, but this can be confusing to have twice the same
name
Change-Id: I570aa5f444ada358eb456d6b3d9b8bfa60b10bbf
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Olivier Goffart [Fri, 28 Oct 2011 07:14:01 +0000 (09:14 +0200)]
Add missing include when enabling deprecated code
QStringList is used by the inline code.
(I did not see that before because I was using precompiled headers)
Change-Id: Ieea4f13c143495f841b5246d835b584cc7404ac6
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Friedemann Kleint [Fri, 28 Oct 2011 08:39:01 +0000 (10:39 +0200)]
Gui/OpenGL: Remove remains of qpa from profiles.
Change-Id: Iff2531a19030bd782ee4cd9bbe529d18666503f9
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Friedemann Kleint [Mon, 31 Oct 2011 09:36:57 +0000 (10:36 +0100)]
Fix most warnings about assignments of QAtomicInt.
Change-Id: Ide409d72d2637b68ec2a85aaca4bc783a7e911e7
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Lars Knoll [Fri, 21 Oct 2011 09:01:21 +0000 (11:01 +0200)]
Correctly handle null windows or widgets in keyClick()
Allow passing of null windows or widgets to keyClick().
In that case route the event through the normal Qt event
processing. This allows e.g. shortcuts to catch the
key event.
Change-Id: Ic9455ea9be5164918b1c0bccbd58dd32eae74ff1
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Jason McDonald [Mon, 31 Oct 2011 05:31:39 +0000 (15:31 +1000)]
Remove disabled code from QMainWindow autotest.
The removed code has been disabled since it was first added in October
2006.
Change-Id: I10243aa2979fd1615c919ec522d10d77d6527b3b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Mon, 31 Oct 2011 05:21:42 +0000 (15:21 +1000)]
Remove unstable test from qgraphicsscene test.
The removed test was disabled in February 2007 because it did not work
cross-platform. The comment that was added at the time claims that the
functionality is covered thoroughly by other tests, but even if that
isn't true we're not losing anything by removing this test as it is not
even useful as a starting-point for a new test due to its reliance on
random test data.
Change-Id: Ica74262082184908d02595702486803d1efff4d2
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Mon, 31 Oct 2011 05:08:57 +0000 (15:08 +1000)]
Remove obsolete test data from qgraphicsitem test
The removed test data was disabled by commit
83747a82 and should have
been removed at that time.
Change-Id: Ia2cef0bf4394a5b95fdf37db26369e733c7e86ec
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Mon, 31 Oct 2011 05:02:15 +0000 (15:02 +1000)]
Remove disabled code from qgraphicssceneindex test
The removed code used to test API that was removed in the graphicsview
refactor that was done for Qt 4.5.1.
Change-Id: I3b312b9e51114e24c6ef1191353c35688b229d99
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Mon, 31 Oct 2011 04:31:01 +0000 (14:31 +1000)]
Remove disabled code from QString autotest.
The removed code was disabled before the tests were imported into the Qt
repository in 2006, so its meaning or usefulness is lost in the mists of
time.
Change-Id: I3108a1a1d86cd135886608f47dcd88bf49f2d3fd
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Mon, 31 Oct 2011 03:11:28 +0000 (13:11 +1000)]
Remove disabled code from QRegExp test
The removed code was disabled before the tests were imported into the Qt
repository in 2006, so its meaning or usefulness is lost in the mists of
time.
Change-Id: Iccdf5638106b054f02ed73790f7acda1b17b045b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Mon, 31 Oct 2011 03:09:08 +0000 (13:09 +1000)]
Remove tests for API that never made it into Qt.
Change-Id: If78d82abfb4ff3402eb8f36729bacc3c4d343d0c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Mon, 31 Oct 2011 02:57:14 +0000 (12:57 +1000)]
Remove obsolete code from QChar autotest.
QUnicodeTables::ligature() was removed from the API in 2006. The
commit that disabled the test also changed the code to call
QChar::ligature(), which has never existed.
Change-Id: I056c17c178a527b076538fb007404ff0b735ba02
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Mon, 31 Oct 2011 02:50:51 +0000 (12:50 +1000)]
Remove obsolete code from qstate autotest.
This was originaly the only test function in this test, and should have
been deleted when it was replaced by the other test functions.
Change-Id: Idc71a5462fd4d19955f9b14389b877be16c62ab5
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Mon, 31 Oct 2011 02:30:14 +0000 (12:30 +1000)]
Improve QBuffer autotest
The documentation of QIODevice::pos() states: "For sequential devices or
closed devices, where there is no concept of a "current position", 0 is
returned". The test had a disabled check for a position of -1 before
the device is opened. Make the test agree with the documentation.
Change-Id: Ide5729bfc825cdb84caf4851574a57d3ef42ccb2
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Mon, 31 Oct 2011 02:24:46 +0000 (12:24 +1000)]
Remove debugging code from QFileSystemWatcher test
Any test diagnostics that are useful should be part of the regular test
output, as the CI system cannot switch on commented-out code when there
is a test failure.
Change-Id: I201ba754df26ffc30997bead8b822f97913db2b6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Mon, 31 Oct 2011 01:58:16 +0000 (11:58 +1000)]
Remove disabled tests from QUrl test.
Some tests were copied in from KDE's KURL sometime prior to Qt's tests
being added to the Qt repository in June 2006. This was presumably
done with the intention of making the tests work for QUrl, but that
never happened and the copied tests have never been enabled.
This commit removes the copied material.
Change-Id: Ic35526f0018900bd60d7905646b24c62317b5e47
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Mon, 31 Oct 2011 01:32:22 +0000 (11:32 +1000)]
Remove obsolete code from qtconcurrentiteratekernel test.
The removed code refers to WhileIteration, which does not exist.
Change-Id: I4c44bc319ac776d16ce9ba7b5c2938ce1642a3f6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Mon, 31 Oct 2011 01:14:58 +0000 (11:14 +1000)]
Remove obsolete code from qtconcurrentrun test.
The removed code was left over from an unfinished MSVC6 compatibility
API (see commit
e3e28e7a in the grafted history). That compiler is
no longer supported, so this code can be retired.
Change-Id: I81bcfa771ae13579f2458eb2d3ebf41c6af8577c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Fri, 28 Oct 2011 08:25:09 +0000 (18:25 +1000)]
Remove debug code from QLocalSocket autotest.
Any test diagnostics that are useful should be part of the regular test
output, as the CI system cannot switch on commented-out code when there
is a test failure.
Change-Id: Ie44b6ea8dd496857ea264f730148d3dc4f5c8324
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Fri, 28 Oct 2011 07:04:19 +0000 (17:04 +1000)]
Remove debugging code from languagechange test
Change-Id: Ic3f1ea9ed3dd4ad78fccd66718f53a798cf8103a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Fri, 28 Oct 2011 07:40:04 +0000 (17:40 +1000)]
Remove dead code from QTransform autotest.
Remove the operator_star_qrect() test function. The body of this test
function has been inside "#if 0" since the commit that created the test
in 2006 and the operator it is trying to test doesn't exist. Seems fair
to assume that this function isn't worth keeping.
Change-Id: I9748273b28eae4b07c3a25f77cee412ad94ea822
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Fri, 28 Oct 2011 07:31:49 +0000 (17:31 +1000)]
Remove debugging code from QPainter autotest.
Any test diagnostics that are useful should be part of the regular test
output, as the CI system cannot switch on commented-out code when there
is a test failure.
Change-Id: Ic7fb619081e9ff453769f4064431dc726e90b985
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Fri, 28 Oct 2011 07:13:26 +0000 (17:13 +1000)]
Remove debugging code from QPathClipper autotest.
Any test diagnostics that are useful should be part of the regular test
output, as the CI system cannot switch on commented-out code when there
is a test failure.
Change-Id: I36c0624cccf70853a697a2395259b387fa334134
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Fri, 28 Oct 2011 07:06:11 +0000 (17:06 +1000)]
Remove dead code from qpixmap autotest
The removed code was in #if 0 in the original commit of the test
function and appears to be an earlier version that should have been
discarded before the initial commit.
Change-Id: I91f16aa7adcccb50f4f3a02062fb9d105d85000c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Sergio Ahumada [Sun, 30 Oct 2011 17:41:51 +0000 (18:41 +0100)]
Fix use of qMax() with floating point constants
When passing floating point constants make sure
to cast them as qreal's.
Change-Id: I17e7ee407ac4f92ce947f6a384aa4d64edb8e983
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Olivier Goffart [Sat, 29 Oct 2011 17:55:36 +0000 (19:55 +0200)]
moc: support c++11 style enums
Task-number: QTBUG-21480
Change-Id: Ic116a5a06dd68036823f27146e49511c68cf2de6
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Lars Knoll [Fri, 28 Oct 2011 18:44:27 +0000 (20:44 +0200)]
Remove S60/symbian specific code
Clean up and remove Symbian specific code and
data.
Change-Id: I89976fd087d485e04d37eccd3aeb3d2beac59b0a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Jo Asplin [Wed, 26 Oct 2011 09:29:58 +0000 (11:29 +0200)]
Re-enabled tst_LargeFile
tst_LargeFile currently seems to pass in a stable way in CI
It does have an issue on 64-bit Linux (see QTBUG-21175), so
that test function is still disabled (QEXPECT_FAIL'ed) on that platform.
Change-Id: I818046f84f2db5eb2155ae1f51f69581029bfaee
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>