Commit Graph

3770 Commits

Author SHA1 Message Date
Toby Tomkins
a2e5f36552 Flag tst_QComboBox tests as unstable.
tst_QComboBox::keyBoardNavigationWithMouse and
task_QTBUG_1071_changingFocusEmitsActivated tests are unstable.

Task-number: QTBUG-23639

Change-Id: Ib8363505213117c581ea2921ebc58d4c2ec4cf8c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-16 08:52:00 +01:00
Frederik Gladhorn
15598b46c1 Accessible docs - editable text interface.
Change-Id: Id8b64ff9674b7cd4ac8551528239e8ab97563764
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
2012-01-16 08:49:15 +01:00
Rohan McGovern
e08453f31a xcb: abort (rather than segfault) when X is not available
Be more user-friendly (e.g. when logging into a machine by ssh and
forgetting to export DISPLAY).

Change-Id: I9d07b0af9c5b4841827826053bb27b507801ae61
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2012-01-16 08:26:16 +01:00
Toby Tomkins
db549f90fa Flag tst_QTreeView::styleOptionViewItem test as unstable.
Task-number: QTBUG-23638

Change-Id: I8c07976001aeec5ba796d4b3e9ee421e32ba1360
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-16 05:30:36 +01:00
Toby Tomkins
5341880105 Flag tst_QItemDelegate::task257859_finalizeEdit test as unstable.
Task-number: QTBUG-23637

Change-Id: Ib08431ab1752c354f62646b3c207d9c24ac5eae5
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-16 05:30:36 +01:00
Toby Tomkins
d4d14e28e6 Modify SSL Socket test exceptions on Ubuntu 11.10 x64.
Modified exceptions as most tests are now passing correctly. Three exceptions
still remain, two serverSideMode tests (ssl3-any, tls1.0-any) and a
verifyMode test.

Task-number: QTBUG-23575

Change-Id: I847e8c2e3484050b8d07ede9aec955c30f7ef5a1
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-16 05:30:36 +01:00
Olivier Goffart
24a72c4efa qglobal: Remove symbian specific features
Change-Id: Ie0480b0c80b68a86e77bf3552546f494cdaf66c1
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-01-16 03:52:32 +01:00
Olivier Goffart
a03b4e4417 Improve the documentation of QStringLiteral
Change-Id: I4bbe18ecc342f034fbc8e9fd14b700ee5272076f
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
2012-01-16 03:51:14 +01:00
Jason McDonald
51cb2dd00a Remove unused QTestResult::allDataPassed().
The removed function was private API and was not used anywhere in Qt.

Change-Id: Ia262d119ebba30f6968cb7145043475bf88ffa39
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-16 01:57:23 +01:00
Jason McDonald
1066d185a6 Rename QTestLog::addIgnoreMessage to QTestLog::ignoreMessage.
Change-Id: I4cfcd00d444d0812c58afab6ffd43dee37db1340
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-16 01:56:51 +01:00
Kurt Korbatits
d9a50fc1dc Moved largefile unittest to same level as qfile.
- Moved largefile from out of qfile unittest directory to be on
  same level as qfile.

Change-Id: I479b0b33594812759f8a6a7be61f8340f64234e9
Reviewed-by: Kurt Korbatits  <kurt.korbatits@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-16 01:55:31 +01:00
Kurt Korbatits
7940521fd9 Changed qrawfont unittest to work from installation directory.
- uses QFINDTESTDATA instead of SRCDIR
- Added check to test if fonts are present and generate one skip instead
  of 1200+ on platforms were no fonts are available for testing.
- fail if unittest fonts not found.

Change-Id: I9c051cf8cef6cd355f16647c614c86771dcf6150
Reviewed-by: Kurt Korbatits  <kurt.korbatits@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
2012-01-16 01:55:26 +01:00
Kurt Korbatits
990e890b9e Changed unittests in corelib to use specific headers instead of super-headers.
Modified unittests to use specific class headers instead of
using super-headers like QtCore that pull in all the headers for
the module.
- Decreasing build time.

Change-Id: I9c3fd0767be15205893bb406f609c8283a2a3a5a
Reviewed-by: Kurt Korbatits  <kurt.korbatits@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-16 01:55:22 +01:00
Kurt Korbatits
f1da37e989 Changed qprocess unittest to work from installation directory.
- All subprograms installed as part of test instead of separate installs
  using installTestHelperApp() from testcase.prf
- Removed use of app_bundle for subprograms

Change-Id: I0a3de021800d36bd48479f63588b09fc7e60f32f
Reviewed-by: Kurt Korbatits  <kurt.korbatits@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
2012-01-16 01:55:18 +01:00
Toby Tomkins
2087db0b20 Flag tst_QGraphicsWidget::updateFocusChainWhenChildDie test as unstable.
Task-number: QTBUG-23616

Change-Id: I664c77b16ac6b2ecd89d362a2c3c3028bd3246c0
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-16 01:42:26 +01:00
Toby Tomkins
e575e2316a Flag tst_qcalendarwidget::buttonClickCheck test as unstable.
Task-number: QTBUG-23615

Change-Id: I4ce9e415c29167ef9fdc584ac3543aa5f109bcf2
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-16 01:42:22 +01:00
Rohan McGovern
78f1dd251a Fixed failure of tst_qhostinfo since ~15 Jan 2012
This test hardcodes IP address / hostname pairs to be used for forward
and reverse lookups.

The reverse DNS entry for 62.70.27.69 has recently disappeared.  Replace
it with an IP / name pair which is (hopefully) much less likely to
disappear.

Change-Id: I03f589e1c0f4bde0b1a14e94b3c1047eeb81246e
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
2012-01-16 01:38:36 +01:00
Liang Qi
e1ddac9b20 Remove references to openvgversion.h
Because OpenVG was removed from qtbase.

Change-Id: Id92ac98a6dee7679248bc3c82554e92386e7ef61
Reviewed-by: Liang Qi <liang.qi@nokia.com>
2012-01-14 14:48:16 +01:00
Olivier Goffart
d057065cbb Document Q_DECL_CONSTEXPR
Change-Id: I61f4017186e8c7b943855723d7c677a01f7a7bf7
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
2012-01-14 10:27:35 +01:00
Kurt Korbatits
0d128aded5 qmake wasn't handling spaces in names when dealing with extra installs.
When installing extra binaries the paths where not being escaped,
causing stripping and deleting to fail when dealing with filenames
that contained one or more spaces.

Change-Id: Iba4517b1110f6af30f7e2662cb86024a8b7b81f7
Reviewed-by: Kurt Korbatits  <kurt.korbatits@nokia.com>
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-01-14 05:36:54 +01:00
Morten Johan Sorvig
e97d77d5bc Clean up QCocoaIntegration destruction.
Fix memory leak - delete the font database. Remove
the NAApplication delegate.

Change-Id: I7c69eb4df01c8450c0abde360f77fbb318b20c83
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
2012-01-14 05:36:12 +01:00
Martin Smith
e58e1abbd9 qdoc3: Don't put \relates in class member functions.
This removes two uses of \relates that were unnecessary.

Task-number:  QTBUG-23599
Change-Id: I3e10375159f6535f56622f9d24e16151938c63c3
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
2012-01-14 03:55:26 +01:00
Janne Anttila
106bab644a Fix qsystemerror for WinCE
Windows CE does not have strerror(_r), so lets use string formatting
provided by windowsErrorString function.

In order to use windowsErrorString it was moved before
standardLibraryErrorString function.

Task-number: QTBUG-22498
Change-Id: Ifa20c4ac314ac8a26de6b0c5b67ced96b262c2b4
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
2012-01-14 03:55:03 +01:00
Mark Brand
f0841fe4cf remove symbian support vestiges from text codecs
Change-Id: I7b577d360cb9c7225da108ee56fd927a91a04dee
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
2012-01-14 03:54:41 +01:00
Janne Anttila
1135aeb1d8 Fixed sqlite for Windows CE.
Windows CE does not declare the localtime function, for this reason
sqlite3.c defines it for Windows CE. However the localtime define
was too late in sqlite.c code since the osLocaltime function
introduced inside ifndef SQLITE_OMIT_LOCALTIME needs it also.

Task-number: QTBUG-22508
Change-Id: I97b9bc6316809178cbcf7e304c5dcd7deb9005cb
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-01-14 03:54:18 +01:00
Jonas M. Gastal
bdce610022 Fixes examples/tests to use qinptr in QTcpServer::incomingConnection.
This is a fix for problems introduced by bf7f170.

Change-Id: If5dd8e031ef2efea578b3efb188c2e950e1ba41a
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
2012-01-13 20:55:00 +01:00
Jonas M. Gastal
14b929e9c4 Cleaning up header includes.
QNetworkCookie doesn't need to know about QNetworkCookieJar and for
QNetworkCookieJar header a forward declared QNetworkCookie is enough.

Change-Id: I21145ce0f67a0a6bd68a46a5e757f82105cdf520
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
2012-01-13 20:54:23 +01:00
Liang Qi
cba92bdb18 Add the version header mapping for 3 new modules
For QtWidgets, QtPrintSupport, QtPlatformSupport, they are new in qtbase.

Change-Id: Ic192b9c805b4d3229f7c94a5bb620dabe455a16f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-01-13 16:48:25 +01:00
Samuel Rødal
72d7dd478e Modified changes-5.0.0 to reflect change to QTouchEvent API.
Change-Id: I378da8d16e1b3b2ea5bd89ede0f194b49c51ae85
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
2012-01-13 16:29:38 +01:00
Janne Anttila
7ce13d00db libpng config for WEC7
WEC7 is missing some time conversion related functions ->
configured libpng for WinCE accordingly.

Task-number: QTBUG-22506
Change-Id: Ia4038aaf44944883be8f3e25817a638118c1a73d
Reviewed-by: aavit <qt_aavit@ovi.com>
2012-01-13 13:23:20 +01:00
Laszlo Agocs
77cfaf1f2c Update touchscreen plug-in's readme
To match the new mouse-for-unhandled-touch-event feature in
QGuiApplication.

Change-Id: Ifa3872ab51a8e95bee235a3681b0a9d1ec13081c
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2012-01-13 13:23:20 +01:00
Janne Anttila
952df2ffd6 Fixed QFile::link behaviour for WinCE devices.
In WEC7 both arguments given for ScCreateShortcut needs to be given in
Windows format. Apparently older WinCE devices has accepted also Unix
format but this is not anymore true for WEC7. The Windows format works
for older WinCE versions as well.

Change-Id: Ic1f394e20bae8ad42acb46929d3ff4af92daf310
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-01-13 13:23:20 +01:00
Janne Anttila
2f20d5f23a Added mkspecs for WEC7 platform builder and armv4i HW.
Task-number: QTBUG-22496

Change-Id: I502e654de7e03fbdbd22b609698d238f90d129a9
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-01-13 13:23:20 +01:00
Janne Anttila
dd5e72e2da Build fix for WINCE to qlocale_tools.cpp
Task-number: QTBUG-22500

Change-Id: If530799cf8ef971f5caf78d0c6dbeeda719d148f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-01-13 13:23:20 +01:00
Miikka Heikkinen
49c5c3e5c5 Windows: Fix qt_ntfs_permission_lookup
Specifying qt_ntfs_permission_lookup++ in application code didn't
make qfilesystemengine_win.cpp respect Windows ACL as it was supposed
to. This was because GetTokenInformation for TokenUser failed always in
resolveLibs() function, because the TOKEN_USER struct that was given to
it wasn't large enough to contain both TOKEN_USER and SID structs that
GetTokenInformation wants to return in this case.

Fixed by calling GetTokenInformation twice, first to determine the
required size, and then another time to get the actual token info.
Additionally, the SID returned as part of the token info needs to be
stored for the lifetime of the application, as the TRUSTEE_W struct
has a pointer to it (currentUserTrusteeW).

The worldTrusteeW initialization also required a change to properly
store the SID.

Note: The dynamic resolution of FreeSid and other SID manipulating
functions doesn't appear to be necessary, as they are found on the
same ifdef level (in winbase.h) as the GetTokenInformation, which
already isn't dynamically resolved.

Task-number: QTBUG-247
Change-Id: I0294c85ea903c86d03c2fcd3d801502b378dc0e5
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-01-13 11:30:43 +01:00
Janne Anttila
2fab348c81 Build fix for WINCE to qfsfileengine_win.cpp
QFileSystemEngine::currentPath() returns QFileSystemEntry, but
this method expects QString return value.
-> Code does not compile for WinCE

Switched code to use "QFileSystemEngine::currentPath().filePath()"
correspondigly as Windows desktop does if filename does not contain
drive letter. This is ok, since WinCE does not support drive letters.

Task-number: QTBUG-22499
Change-Id: Ic4935357c40cda30efcd2e1c7d69bf2ef7b31dd0
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
2012-01-13 11:30:43 +01:00
Mark Brand
621b121c07 add missing multiple inclusion guard
Change-Id: I82e9d1ddfc1a46bf47b8948dce800dcbcc1a0305
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Constantin Makshin <cmakshin@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-13 11:30:43 +01:00
Friedemann Kleint
7549dc9e54 Windows: Use a message-only window as clipboard viewer or for GL.
Change-Id: Ib8d287404b157aae2f4493ef8eba220afaba6c47
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-01-13 11:30:43 +01:00
Samuel Rødal
e50416066c Added application flags to translate between touch and mouse events.
The current way we do it of having the platform or touch plugin send
both mouse and touch events is not ideal. There's no good way to write
an application that works sanely both on a touch-only device and on a
desktop except by restricting yourself to only handling mouse events. If
you try to handle touch events you don't get any events at all on
desktop, and if you try to handle both, you end up getting duplicate
events on touch devices.

Instead, we should get rid of the code in the plugins that automatically
sends mouse events translated from touch events. This change enables
that by making the behaviour fully configurable in QtGui.

Two new application attributes are added to explicitly say whether
unhandled touch events should be sent as synthesized mouse events and
vice versa, and no duplicates are automatically sent as the current
situation. Synthesized mouse events are enabled by default.

We also get rid of the QTouchEvent::TouchPoint::Primary flag, which
was only used to signal that the windowing system automatically
generated mouse events for that touch point. Now we only generate mouse
events from the first touch point in the list.

Change-Id: I8e20f3480407ca8c31b42de0a4d2b319e1346b65
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
2012-01-13 09:38:05 +01:00
Debao Zhang
b54cfb3124 QEventDispatcherWin32's internal Window should be a Message-Only Window
A message-only window enables you to send and receive messages. It is
not visible, has no z-order, cannot be enumerated, and does not receive
broadcast messages. The window simply dispatches messages.

Task-number: QTBUG-17144

Change-Id: Ibaf18f9ef5165166bf0b88e2f4952faba96d5eef
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-01-13 09:38:05 +01:00
Morten Johan Sorvig
7407045388 Cocoa: Send window activation events.
Change-Id: I599b4316f1535bf4855b205bfb2117bbcee63bf0
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
2012-01-13 07:47:47 +01:00
Olivier Goffart
56b2a229a3 Remove the Q_NO_DATA_RELOCATION hack
This hack was there because symbian used to have a problem with
relocations in the data section, between libraries. Hence, this was needed
so the metaobject could have a pointer to the base metaobject, despite
being in another library.

Anyway, I was told that symbian was fixed eventually. but the hack had to
stay there because of compatibility. But now that we don't even support
symbian, we can get rid of this hack totally.

Change-Id: I7249971ece35d952efa92bf8b04bf3aa3667624c
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
2012-01-13 05:57:39 +01:00
Jason McDonald
0528d9dca7 Improve coverage of expectfail selftest
Add a test case for calling QEXPECT_FAIL in a data-driven test without
passing a specific data tag for the expected failure, in which the
expected failure should apply to the current data row.

Change-Id: I70a6592de77b1718c3a749fd2216e66f8f312805
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-13 04:04:17 +01:00
Jason McDonald
3dfdf34c1c Improve coverage of expectfail selftest
Add a test for the case where a call to QEXPECT_FAIL nominates a
different data row from the current row, in which case the call to
QEXPECT_FAIL should be ignored.

Change-Id: Iff774b89f9374fa26105acdd8769177272a95229
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-13 04:04:12 +01:00
Martin Smith
c373c538e8 qdoc3: Don't put a \table in a \value
In qdoc, the \value command is meant to document a single value of an
enum. e.g.

\value TypeOfService Text describing the type of service. It runs until
the next \value or a blank line.

Although it doesn't say you can't build a \table in the \value text,
it doesn't work. For now, the fix is to remove the \table from the
\value text and make the table separate from the enum \value list and
let the description of the \table refer to the value that it belongs
to.

Task-number:  QTBUG-23599
Change-Id: I88b456dca419a565eece30ba20fe09c0bcd4d98d
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
2012-01-13 04:04:09 +01:00
Martin Smith
9b1dcfe901 qdoc3: Don't put \relates in class member functions.
This removes two uses of \relates that were unnecessary.

Task-number:  QTBUG-23600
Change-Id: Id9bbcfa6f95d42ad552054e4839dbacb69fd1b2a
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
2012-01-13 04:04:04 +01:00
Kalle Lehtonen
1c53694a17 Revert "Fixed qtmodule-configtests on Windows"
This reverts commit bb4caf3c4937418ca0e33d60cf0b25d6cfc3ea95

Change-Id: I25a9e45c9fa0953bdfe1bc112bf45341802c020d
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
2012-01-13 04:03:59 +01:00
Jason McDonald
fa07815892 Improve coverage of expectfail selftest.
Add a test for the case where QEXPECT_FAIL is called twice in a row
without an intervening verification step, which is supposed to result in
a failure.

Change-Id: Ie004652a76a2c35c2679945670ff5561e8f5b62e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-13 01:41:14 +01:00
Alexander Færøy
ced306d403 Remove shadowing members in QNetworkReplyHttpImplPrivate
Task-number: QTBUG-23512

Change-Id: I072dfde1741a1d32a6125f63e52cc22bc499987f
Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
2012-01-12 20:47:34 +01:00
David Faure
22225b1b06 Fix compilation of public headers with -Werror=shadow
Change-Id: Id47623002abca1e03fdfb9e9bd9cbc1b5542a2db
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-01-12 18:44:56 +01:00