Commit Graph

13998 Commits

Author SHA1 Message Date
Thiago Macieira
f5b3cbb8f7 Fix warning about using QString's const char* constructor on Mac
Change-Id: I20ca50fdcdcfb075ad317247f147e4eb007a0c44
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2013-07-20 05:05:49 +02:00
Thiago Macieira
bfc5bb09c4 Ignore or suppress warning and debug messages in tst_QLocalSocket
The one in tst_QLocalSocket::writeToClientAndDisconnect just needed
proper ordering: that's what waitForDisconnect is for. At the same time,
we need to make sure we get the same message from all three
implementations of QLocalSocket::waitForDisconnect (and without the
useless space at the end).

Change-Id: I21364263cf908df022df814a6a39fcb5783e84e6
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
2013-07-20 00:22:07 +02:00
Thiago Macieira
674e79416f Fix incomplete override of QIODevice::open in QProcess and QLocalSocket
The rule for a new override is that it must still work if the old
implementation is called. The catch is that any class that derives from
QProcess and isn't recompiled will still have QIODevice::open in its
virtual table. That is equivalent to overriding open() and calling
QIODevice::open() (like the tests).

In Qt 5.0, QProcess::start() called QIODevice::open directly, not the
virtual open(), so there's no expectation that a user-overridden open()
be called. With that in mind, simply fix QProcess::start to not call the
virtual open at all.

Similarly with QLocalSocket, the calls to open were always non-virtual.

Task-number: QTBUG-32284
Change-Id: I88925f0ba08bc23c849658b54582744997e69a4c
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
2013-07-20 00:22:03 +02:00
Thiago Macieira
4a7e37b0a3 Add a test for QLocalSocket::open
This should have been done in the commit that introduced open
(953255abab), but was missing.

Change-Id: I1c2de4ad5fa42aa5b90646e7d4d7d1b1570a0f87
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
2013-07-20 00:22:00 +02:00
Stephen Kelly
87db2fdef3 Use the compilers used by Qt for the CMake tests.
Task-number: QTQAINFRA-609

Change-Id: I32ad70a4b31baf1815c2c08ac16e35e78052e569
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2013-07-19 12:32:14 +02:00
Eskil Abrahamsen Blomfeldt
61fbdc00fb Fix compilation of run-time-resolved SSL on Android
We need the same code for both the no-sdk and the sdk case for
the OpenSSL code, since this is not covered by a system library,
but by an external dependency in both cases.

Task-number: QTBUG-32130
Change-Id: I976835556fcb0e6c32cfb3da4dd585e45490061b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-07-19 12:32:14 +02:00
Gatis Paeglis
8609a63297 Add manual test for UNC paths
Change-Id: I25949b6fb04dc4bb976f4daea96cbab2897e15af
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-07-19 10:10:19 +02:00
Joerg Bornemann
5d6dbc6637 fix endless loop in QProcess/Win drainOutputPipes
Commit 568f82fba3 was incomplete.
If drainOutputPipes detected some readyRead it wouldn't end the loop.

Task-number: QTBUG-32354

Change-Id: I4e594f1e148abe9ef36c047a55eee1b22fd5064b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-07-18 15:25:16 +02:00
Friedemann Kleint
81addcc1ed XCB: Set WM_CLASS.
Set the instance name and class name of the application windows.

Task-number: QTBUG-29396

Change-Id: Ia1fb492ab169108c3779deb8964bb731b322dd89
Reviewed-by: Uli Schlachter <psychon@znc.in>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2013-07-18 15:12:37 +02:00
Bjoern Breitmeyer
07bc530250 Better errorhandling for the fontengine on WINCE.
The CE fontengine only supports translations, scaled
Text would only work if its an isometric scale and would
require to create a new font from the old one. Rotations
and more aren't supported at all. The freetype fontengine
for CE supports this, so we give a warning that the font
might be rendered incorrect, but could render correct with
the freetype engine.

Task-number: QTBUG-32189

Change-Id: I3581c3fef8e4ee118c0038a6ccc237e66b583731
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-07-18 15:07:45 +02:00
Friedemann Kleint
183cc501d6 QNX: Handle Qt::WindowDoesNotAcceptFocus correctly.
Discovered while working on:
Task-number: QTBUG-32385

Change-Id: Id1ff31ea6a367983676125810b4f49629233d374
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Frank Osterfeld <frank.osterfeld@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
2013-07-17 16:08:24 +02:00
Takumi Asaki
12e97b5fb4 Fix typo in qdoc's messages.
Change-Id: I837eaef4fb114c20a75ffc188b49aa612f07f507
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
2013-07-17 13:58:19 +02:00
Liang Qi
c9182bc11b OSX: Disable window restoration for the Mac font panel
because if it is automatically restored it's out of the application's
control, so the user's interaction will be ignored.  Change
I8ce3cd94f5ae81d7877a346743ca4e0e188baa02 did this for normal windows
by default, but the dialog helpers generate windows which aren't
affected by that.

Change-Id: I819d7ab4e51e90783d55cee0676dbc33b38c5b00
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2013-07-17 11:36:47 +02:00
Mitch Curtis
5ec344cc77 Make *ItemBoundingRect modes work with custom shapes.
Currently, calling
QGraphicsScene::items(QPointF(0, 0), Qt::IntersectsItemBoundingRect) or
QGraphicsScene::items(QPointF(0, 0), Qt::ContainsItemBoundingRect)
will exclude items whose shape does not contain QPointF(0, 0). This is
because QGraphicsSceneIndexPointIntersector::intersect() also checks if
the point is contained within the shape, instead of just checking
if it is contained within the bounding rect.

Task-number: QTBUG-19036

Change-Id: Ie701af2a5694d40cf9b3c9c19adbb09a53a4e398
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
2013-07-16 20:42:01 +02:00
Alberto Mardegan
9b8b6c7db8 Fix QDBusAbstractInterface::isValid() for peer connections
Do not attempt to lookup the service owner on peer connections (it will
fail).
Make QDBusAbstractInterface::isValid() return a sensible result on peer
connections, instead of always returning false.

Task-number: QTBUG-32374
Change-Id: I1b02feaffb3b255188f8d63306f89f5034a32f22
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-07-16 18:32:14 +02:00
Friedemann Kleint
8493f5d6a3 Detect popup window correctly in modal window blocked handling.
Task-number: QTBUG-32433

Change-Id: Ida8f6237a383311bc2e231de90fd54b90ebd1508
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2013-07-16 16:28:11 +02:00
David Faure
4315f270e6 Fix compilation of QLockFile on Solaris
flock isn't available but we use fcnlt already (which is the recommended
alternative on Solaris)

Change-Id: I718e59c4804950a26eeb610888e17ce666522dcc
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-07-16 16:28:11 +02:00
Friedemann Kleint
aab50ad061 QGuiApplicationPrivate::updateBlockedStatus(): Recurse over children.
Task-number: QTBUG-32242

Change-Id: Ia43257a998507b9a367f41dc2395ab92cc89a118
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2013-07-16 16:28:11 +02:00
Topi Reinio
e89547fff4 Doc: Update description of QAbstractItemModel::supportedDragActions()
Update documentation for the QAbstractItemModel::supportedDragActions()
(virtual since 5.0) and the obsoleted setter function.

Task-number: QTBUG-32410
Change-Id: I4f77601bca63e5f782ade1f577104500f541bbb1
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
2013-07-16 14:23:13 +02:00
Friedemann Kleint
ef93397d70 Mac OS: Fix a crash in tst_qgraphicsproxywidget.
Change-Id: Ie93d77f00ee1e6a04ac20794e4d2d1e63cbdb636
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
2013-07-16 12:16:19 +02:00
Stephen Kelly
4a212be6f0 Only run the cmake test in the install location if not already done.
For developer builds, there is no need to run the test a second time.

Change-Id: I3564874cb2e9d6cc243e25a89ecd7f89df23b0bd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-07-15 21:56:51 +02:00
Stephen Kelly
c843fac5df Define QT_NO_DEBUG with RelWithDebInfo and MinSizeRel builds.
Task-number: QTBUG-32403

Change-Id: I709ca32ca5bc1a342593357735ef3911ef849eb9
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2013-07-15 19:45:49 +02:00
Oswald Buddenhagen
94e42cb772 un-clash iterator names
Change-Id: I96b995c7f6dec06f75a61e109c419c9204744d90
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-07-15 19:45:49 +02:00
Oswald Buddenhagen
922df2c233 don't change timestamp of unchanged files
Change-Id: Ifa5c15a37d072c6c8edb50f8a4343d99ee0dccf9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-07-15 19:45:49 +02:00
Oswald Buddenhagen
ca645afdc4 de-duplicate writeout of config files
Change-Id: Iaad06f170cf2be3d3fca533a735b69316347ed5b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-07-15 19:45:49 +02:00
Oswald Buddenhagen
8a245c9fc2 prune unused filesDiffer() and writeToFile() functions
Change-Id: I470a5b3514260a02e73389d057d89c64b08e05d0
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-07-15 19:45:49 +02:00
Oswald Buddenhagen
79fcc7787a undo accidental string merge
amends 51980595e1.

Change-Id: Ie4fd4a6d762f4c87dabd7d3124f3397b0f853b77
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2013-07-15 19:45:49 +02:00
Sergio Ahumada
d309574c03 tst_QIcon: Fix availableSizes() and task223279_inconsistentAddFile()
Copy some needed files into a local folder when QtWidgets is not
available.

Task-number: QTBUG-31993
Change-Id: I93b65bda198c22a60e979c119de8de683a78bb53
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-07-15 16:28:25 +02:00
Sergio Ahumada
83de0910c1 test: Mark tst_QNetworkReply::backgroundRequestInterruption() as XFAIL on OS X 10.8
Task-number: QTBUG-32435
Change-Id: Ibc4495126b066c17e6a4477f403677b9fc9da453
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-07-15 16:21:15 +02:00
Sergio Ahumada
a0640d328f test: organize tst_qnetworkreply .pro file a bit
- Don't run this test in parallel
 - Remove redundant QT=-gui
 - Place the insignificant_test marks together

Change-Id: I078fa29a4dccef9af8798792d06d51835b4b8934
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-07-15 13:49:59 +02:00
Friedemann Kleint
49a55be973 Windows: Synthesize expose event for shrinking windows.
Synthesize expose events for all Windows except ANGLE-windows.

Task-number: QTBUG-32121

Change-Id: Ifbff2730ec8f2e8cfe23eeb4022b76a6e432598e
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2013-07-15 09:46:23 +02:00
Friedemann Kleint
e4484bb15b XCB: Append 0-character to atom name string.
The below loop needs 2 consecutive 0-characters to terminate
properly.

Change-Id: I73e56cadbcd2515d5b0f1b4907316a27a6bbaf0e
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2013-07-12 19:23:49 +02:00
Gabriel de Dietrich
64caf7b1be Display sizegrip on QMdiSubWindows, even on 10.7 and later
We don't have 4-edge window resizing, so we need QSizeGrip to
be functional again in this case.

Task-number: QTBUG-32228
Change-Id: Ib66bc662f8bf0b521427755570bc1cd65fb28446
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
2013-07-12 17:02:54 +02:00
Tomasz Olszak
4f71a272b5 QCoreApplication: Removed out-of-date docs (argv() method).
QCoreApplication::argv() method was obsolete in Qt4.8
and removed in Qt5.0.

Change-Id: I217402f774f5509c8ca317a35c831ffa5ac2af06
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-07-12 14:54:09 +02:00
Thiago Macieira
9f3f455151 Fix disconnectFrom{Peer,Bus} when the connection failed
If the connection failed, the DBusConnection object is null, but we
still add our QDBusConnectionPrivate to the global hash (maybe we
shouldn't). Both disconnectFromXXX functions check that they are
disconnecting a connection of the right type, but we never initialized
the type if the connection failed.

So simply make sure we initialize before handling the error state.

Task-number: QTBUG-27973
Change-Id: I96f4825ab1b71adf1b72caf4f72db41742b44a55
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2013-07-12 14:53:12 +02:00
Friedemann Kleint
7e7c689c34 Fix domain in manual test qhttpnetworkconnection.
Task-number: QTBUG-32390

Change-Id: Ic56640087d1f07edeca5f5fc36acac9dddc79c73
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
2013-07-12 12:41:30 +02:00
Friedemann Kleint
b72a32b05d Remove Nokia-domains in commented-out test code.
Task-number: QTBUG-32390

Change-Id: Ida7d54aba9cde5c472ff6bb2696d1201ba4f2199
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-12 12:41:30 +02:00
Friedemann Kleint
6c37fb70d6 Consider virtual screen when determining dock widget visibility.
Task-number: QTBUG-32260

Change-Id: I8b28e3869a6e3b1ed12a311dfa0100979098fc4b
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
2013-07-12 12:41:30 +02:00
Allan Sandfeld Jensen
e602003f87 DirectFB: Improve mapping of multimedia keys
The play_pause key was mapped incorrectly to direct pause. This one
maps it to togglePlayPause.

The two keys fast-forward and rewind have been mapped to
Key_AudioForward
and Key_AudioRewind, matching XCB and Android mappings.

Change-Id: I481bafab2fdfe1824b49e268e9d0754eef348cbf
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
2013-07-12 09:55:21 +02:00
Bradley Buda
5cab14b8a1 Correct algorithm for digest auth when using the CONNECT verb
QHttpSocketEngine fails to authenticate to an HTTP proxy that is using
Digest authentication and the CONNECT method (i.e. when you are
tunneling TLS over HTTP). The bug is due to a bad parameter being
passed to QAuthenticatorPrivate::calculateResponse - the requestMethod
parameter is passed in as "CONNECT " instead of "CONNECT" (note the
trailing space).

Because an MD5 hash is derived from this method when using the
qop="auth" flavor of Digest auth, the hash does not match the expected
value and authentication always fails in this configuration.

Change-Id: Ia97ce5967bfb57b28db7614347ffdcaa56e4da0c
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
2013-07-12 02:29:41 +02:00
Friedemann Kleint
376abfab39 Remove references to Nokia in qtbase examples.
Change-Id: I0d4a309bc7f92e1ad2c7465bfb2d677c91e6d818
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-07-11 17:29:39 +02:00
Kai Koehne
2c0f7fb8dc Fix compilation of libGLESv2 with older MinGW-w64 headers
Fix compilation of libGLESv2 for mingw-headers predating MinGW-w64
svn commit 5567 (like MinGW-builds gcc 4.7.2-rev8, the toolchain
we officially support).

Commit 5567 added the D3DCOMPILER_DLL define to d3dcompiler.h, but with
a trailing semicolon that has then fixed in commit 5783. Any toolchain
that ships MinGW-w64 headers from a version in between (like
MinGW-builds gcc 4.7.2-rev11) will unfortunately remain broken.

Change-Id: I31272a1a991c4fc0f1611f8fb7510be51d6bb925
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-07-11 17:29:39 +02:00
Friedemann Kleint
0b9c942f3d Use QFINDTESTDATA in tst_qfontdatabase.
Change-Id: I851dbe18cd3ba9a07ddac71d23e04f5211b2db17
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
2013-07-11 17:29:39 +02:00
Friedemann Kleint
bf42eacc7f Windows font database: Resolve aliases for extra fonts.
Ensure QFontDataBase::hasFamily() deals with aliases.

Task-number: QTBUG-31689

Change-Id: Ia59bfcb93362ac9343c6d30dab1091a4db482dfa
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
2013-07-11 17:29:39 +02:00
Andy Shaw
30f19d904f Check if widget inherits from QTextEdit when drawing the frame
There can be cases where the accessibility plugin is not available so
rather than have an incorrect style in those cases we check if the
widget inherits QTextEdit.

Change-Id: Ia514ce61f24ef016f56c6dce103f90f699b4048a
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
2013-07-11 15:01:24 +02:00
Friedemann Kleint
7b9d6cf844 Stabilize tst_qguiapplication.
Introduce QScopedPointer for windows or instantiate them on the
stack to prevent leaks. Tile all windows within virtual
screen to ensure they don't influence each other and are not
in the taskbar area.
Move cursor away from windows in modalWindow-test.

Change-Id: I40343e9f72263e22bdf2560448d7efcc915d17cb
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2013-07-11 10:56:49 +02:00
Mitch Curtis
1ff0ac9415 Fix typo in setGraphicsEffect() occurrences.
Change-Id: Iaca926ab47670616b55b0ab7ab735710237a5df8
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-07-11 10:56:49 +02:00
Shawn Rutledge
001b80305a QDir::mkpath shouldn't fail if parent directory denies access
The fix for QTBUG-30046 introduced this regression on Windows, which
meant that it became impossible to create a directory anywhere under
c:\Users for example, because each user only has permission to see
his own directory.

Task-number: QTBUG-32314
Change-Id: I1b35433265934d4978d4b0c23a946c3f920c710d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-07-11 10:56:49 +02:00
Mitch Curtis
5ec3b2826b Test password mask delay and characters on Mac.
Task-number: QTBUG-31498

Change-Id: Iab4a56b94364e3db78070aca40c629f9398ffbb7
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2013-07-11 10:56:49 +02:00
Thiago Macieira
eb5749e8d9 Bugfix QDesktopServices on Windows
It was doing tricks with URLs that it shouldn't be doing... including
running QDir::toNativeSeparators on a URL.

Task-number: QTBUG-32311
Change-Id: I5b6f640919956998c00dcf507f931045f21a9e53
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-07-11 10:56:49 +02:00