Commit Graph

27619 Commits

Author SHA1 Message Date
Maurice Kalinowski
7565b73434 winrt: Enable windeployqt by default for Visual Studio projects
Using Visual Studio a user very seldom wants to disable the automatic
invocation of windeployqt. Hence switch from opt-in behavior to opt-out.

This also fixes first user experience to invoke qmake –tp vc and then
hit run on examples.

[ChangeLog][Platform Specific Changes][qmake] qmake-generated Visual
Studio projects now automatically invoke windeployqt by default.

Task-number: QTBUG-52008
Change-Id: Iee1607269c38c7f6c726f554978ac05477bebe5e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-03-23 09:56:56 +00:00
Marko Kangas
1bbbb682b5 Initialize input method for read-only QTextBrowser
Set input method attribute to be aligned with read-only
value in QTextBrowser initialization

Task-number: QTBUG-52071
Change-Id: If0e64bf09e2a2d505ed66fcbfb8cd12ae39844d3
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
2016-03-23 09:46:24 +00:00
Olivier Goffart
4f8ac09a4f QSysInfo: Fix clang generated documentation
Clang expects valid expressions. (Code that actually compiles.)

Now this is a valid expression ('or' is a C++ keyword meaning '||').
And it still has the meaning we want to convey in the documentation.

Change-Id: If217e9e448eabe2a64df81cf5cd25f8c17e22109
Reviewed-by: Edward Welbourne <edward.welbourne@theqtcompany.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
2016-03-23 08:44:36 +00:00
Olivier Goffart
f11ea381d6 Fix parsing of documentation for QByteArrayList and QStringList
QListSpecialMethod is an internal class. Everything needs to be hidden
from Q_QDOC otherwise while parsing with clang, we get errors.

Importantly, hides it while inheriting from QList so it does not
appear in the documentation

Change-Id: If2ac158f35d6a367aa033cfc7e6a054c912359b9
Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
2016-03-23 08:44:11 +00:00
Simon Hausmann
8e2d3e3b90 Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I9a10e1f3c9506ec8554d8f59b6300825ac730939
2016-03-23 08:29:43 +01:00
Kai Pastor
4ccfb1eb92 Fix tests for build with -no-gui
Change-Id: I48d5452daeaf3490ed7a5b8c30953da019bb33af
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
2016-03-23 06:52:46 +00:00
Olivier Goffart
63274c95a3 Add QCommandLineOption::Flags containing HiddenFromHelp and ShortOptionStyle
This patch adds a new option, QCommandLineOption::ShortOptionStyle, which helps
applications (such as compilers, so moc and now qdoc) which need to mix long-style
and short flags.

[ChangeLog][QtCore][QCommandLineOption] Added flags() and setFlags() methods.
Added ShortOptionStyle and HiddenFromHelp flags.

Change-Id: I944ce56aff2b28ecd6bb9d2d23c4e726e9d06647
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-03-23 01:08:28 +00:00
Gabriel de Dietrich
f319b9b43c QOpenGL: Fix GLhandleARB redefinition on OS X
Some Qt users include non-system OpenGL headers, resulting
in a possible mismatched redefinition of GLhandleARB.

Ideally, we'd like to skip the whole glext.h inlined portion
and rely on qopenglext.h. However, some issues remain such
as GLDEBUGPROC not being defined on OS X.

Change-Id: Ie551cf0be309234b22cd615cc3703980f48298b9
Task-number: QTBUG-46149
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
2016-03-22 23:04:17 +00:00
James McDonnell
005a8bfbf0 Remove QPROCESS_USE_SPAWN and all that it surrounds
The spawn code was only used to make QProcess work on QNX 6.5.0.  Fork
works on QNX 6.6.0.  The QNX spawn implementation has a flaw that causes
a deadlock in certain situations.  When a working directory is specified
for the process, the QNX spawn implementation stops all threads except
the one doing the spawn so that it can temporarily change the process'
working directory.  This can lead to a deadlock if the thread does
anything that conficts with something being done in a stopped thread.
QNX 6.5.0 is no longer supported in Qt 5.6.0 so we can just switch QNX
to the fork implementation and get rid of the spawn implementation.

Made a QNX specific adjustment to the hardExit test.  There's a bug
in the OS that the test can run into because it does something that
normal applications wouldn't.

Task-number: QTBUG-47250
Change-Id: Ib32567d2c15ce651815858000035ac5aa6f35224
Reviewed-by: Dan Cape <dcape@qnx.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
2016-03-22 15:20:06 +00:00
Alexander Volkov
17d3825874 Don't use obsolete QStyle::PixelMetric enum items
There is only one place in Qt Widgets where they are still present -
QProgressDialogPrivate::layout().

Change-Id: I53742dd6d5a61e468a90c6a487cf2a67f89b244c
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2016-03-22 14:48:22 +00:00
Friedemann Kleint
663263c124 QWidget::create(): Mark parameter window as ignored.
Remove parameter from QWidgetPrivate::createWinId(), add a warning and fixme
comments. Update the documentation to point the users to QWindow::fromWinId()
and QWidget::createWindowContainer().

Task-number: QTBUG-33079
Task-number: QTBUG-51853
Change-Id: I03ae922b31bb46a411889cc0260ea14a4d933492
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-03-22 14:20:41 +00:00
Andreas Holzammer
8fd96d78f0 qmake/wince: Deploy QPA plugin as well in Visual Studio
Change-Id: Ia936290ddb61a85be18d903b64d4b11c709b0732
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
2016-03-22 14:10:12 +00:00
Andreas Holzammer
f8d790f086 qmake: Fix wince dll deployment in Visual Studio
This fix repairs the mechanism to deploy Qt dlls as well as C++ runtime
to a wince target in Visual Studio.

Do this by adding a deploy section in the Visual Studio solution and
adding the C++ runtime from the mkspec to the files deployed to the target.
Deploy target path is set to what the wizard of Visual Studio defaults to.
Before, the c++ runtime was only deployed for executables which were built
as part of Qt.

Task-number: QTBUG-50924
Change-Id: I478010dc16e35c68578281895aa3ae14b5c96bb4
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
2016-03-22 14:10:03 +00:00
David Schulz
dfb9b9e1f7 configure: enable QSharedMemory when targeting windows.
Change-Id: Ib20e7bab80c2207c50cc221eba5eae996a805242
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-03-22 13:15:21 +00:00
Shawn Rutledge
bf17e30c8e QApplication: remove unused static qt_tabletChokeMouse
It was only set, never tested, not exported, and the name is awful.

Change-Id: Ie6a783341984a11139b1481e94af09cb7d1bb9b8
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2016-03-22 13:06:18 +00:00
Christian Strømme
bf60b1636d Mir: Call QPlatformIntegration::destroyScreen() as recommended.
The QPA plugin was deleting the screen object manually, which
is not needed or the recommended approach. The screen(s) are already
maintained by QGuiApplication and destroying the screen object(s) should
be done by calling QPlatformIntegration::destroyScreen().
This change removes the need to keep a reference to the screen(s) in the
mir platform integration class, and removes the warning printed on exit.

Change-Id: I61f37c25ebabf3e96e4cea458c4af454d025926a
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
2016-03-22 13:02:00 +00:00
J-P Nurmi
be5e9247e9 qshapedpixmapdndwindow.cpp: fix build with '-qreal float'
Change-Id: I57a0c8cd7cd10f122dfe81e25c14f141b6f81d57
Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2016-03-22 12:29:28 +00:00
Rolland Dudemaine
c09bc82f0a Do not use forkfd for INTEGRITY.
unix is defined for the integrity target. Remove the general |integrity
and only special-case forkfd.

Change-Id: I8752e62659c28261b2309013fad6e8a82b9397d1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2016-03-22 10:59:04 +00:00
Rolland Dudemaine
8256c680c2 Do not use timezone at all for Q_OS_INTEGRITY.
Change-Id: I3674b86b65a6ec47c89cc4f49e00361e9b87a7c3
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2016-03-22 10:58:56 +00:00
Rolland Dudemaine
4d838e31a9 Add support for INTEGRITY with eglfs-viv.
Change-Id: Ief53608d84d8c4a773b79cfe227c3ea425f677cf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
2016-03-22 10:45:31 +00:00
Rolland Dudemaine
47c7ae25c6 Add INTEGRITY Framebuffer-based plugin as a platform plugin.
The plugin builds as a static plugin.
It is based on the Linuxfb plugin.
It uses the INTEGRITY FB API for framebuffer for display, and HID API
for input (mouse, keyboard, touch).
Because this is the only supported plugin and requires to be included
as a static plugin, automatically add the platform to any application
through qmake.conf.

Change-Id: Ic228afb59cb39dd02c2d538de46caf6e6ea7d153
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
2016-03-22 10:42:03 +00:00
David Schulz
cb72faf2f2 mkspec: Correctly cleanup qhost.pri file.
Change-Id: Ieb430f5ae681713006987de9f915709e843cebca
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-03-22 09:45:10 +00:00
Friedemann Kleint
c599e7db7e win32-icc: Make it possible to rename the ANGLE libraries.
Adapt the mkspec which was forgotten in change
b0ec05f27b.

Task-number: QTBUG-48431
Task-number: QTBUG-51686
Change-Id: Ie95e650de8b7a7027979ec637fb77c7f0357a598
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-03-22 09:25:05 +00:00
Friedemann Kleint
b657496a0b QLineEdit: Use High DPI pixmap for clear button.
Add a 32x32-pixmap to the style and factor out a function from
QStyle::standardIcon() to assemble the icon. The 32x32 pixmap may also be used
for the 16x16 case with devicePixelRatio=2.

Change QLineEditIconButton to use QStyle::standardIcon() instead of
QStyle::standardPixmap passing the QWindow to obtain the correct pixmap
from the icon.

Task-number: QTBUG-49374
Change-Id: I9895230f66911752cc13b7212609141610df0977
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
2016-03-22 09:25:00 +00:00
Marc Mutz
a125b2c4c7 QVersionNumber: compile with -Wzero-as-null-pointer-constant
(backport of qtbase/f43885f8d14e045e5ec47857d62a140d99d16cfa)
Change-Id: I9735c04d90353372cf9b32828ed839f80c31a88a
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
2016-03-22 09:23:48 +00:00
BogDan Vatra
a3269e1801 Allow the user to choose how much from Android theme is extracted
This way Quick Controls 2 users will have a much faster start up and the
extraction time is reduced x10.

[ChangeLog][Android] Allow the user to choose how much from Android
theme is extracted.

Change-Id: I063086251880d50d7fdd72ee35536c4094b47f74
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2016-03-22 09:14:14 +00:00
Liang Qi
a02863234d Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
	configure
	mkspecs/common/wince/qplatformdefs.h
	src/plugins/platforms/directfb/qdirectfbbackingstore.cpp
	src/plugins/platforms/xcb/qxcbbackingstore.cpp

Change-Id: Ied4d31264a9afca9514b51a7eb1494c28712793c
2016-03-22 07:28:42 +01:00
Gabriel de Dietrich
56384a854a QCocoaMenus: Use mix-in pattern to implement menu hierarchy
To solve menu item roles from their text, we need to find
its depth in the menubar hierarchy. Unfortunately, there's
no trivial way to access that hierarchy from the QPA side,
so we need to come with an ad-hoc solution.

Previously, we were using a dynamic proprety to keep track
of the 'parent' object. However, as the life span of the
different objects has changed since 09acf326db,
we need a way to keep track of the parent's existence.

This is what we do in this patch by having both QCocoaMenu
and QCocoaMenuItem also inherit QCocoaMenuObject. This class'
sole role is to store the menu hierarchy's parent object and
wrap it in a QPointer.

Change-Id: Ia18d95171af76d26f6325eef04c77b40d99c4285
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
2016-03-22 05:56:57 +00:00
Dmitry Shachnev
e4d79e1fde Add createMenu() method to QPlatformMenuBar
The D-Bus platform menus are only useful inside menu bars and system
tray icons, and should not be created for other cases (like the context
menus).

This adds a new virtual createMenu() method to QPlatformMenuBar class,
analogous to the already existing QPlatformSystemTrayIcon::createMenu()
method, and adds support for it to QMenuBar.

The D-Bus platform menus are now created from QDBusMenuBar class. As an
additional benefit, we no longer have to check whether the AppMenu
Registrar service is present for every created menu, and check it only
once (this should speed things a bit up).

Change-Id: Ic7d94e58a501ab9d2954aeb342ebd46ef8e62d49
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
2016-03-21 21:21:30 +00:00
Louai Al-Khanji
e77b13621f Blitter Paint Engine: Check more specifically for solid fill brush
The previous state did not account for Qt::NoBrush. This caused a bug
where a draw call with Qt::NoPen and Qt::NoBrush incorrectly causes a
solid black fill instead of being a no-op.

Change-Id: If3b90d6cb99043d68976aca143cac64ad5d8ea9e
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
2016-03-21 19:06:14 +00:00
Alex Trotsenko
13abbea788 Rework toggling the state of read notifier on buffered socket
Read notifications on a buffered socket are enabled all the time while
the socket is connected unless the buffer size limit is reached. To
enable the read notifier again, the user needs to read the data or
enlarge the buffer with a setReadBufferSize() call.

According to that scenario, it's very likely that the socket will
toggle the state of notifier twice (on->off->on) in one notification
cycle. Also, use of the readyRead() signal with a queued connection
leads to the same problem.

This patch prevents this unnecessary toggling by:
- unconditionally setting the notifier's state in setReadBufferSize();
- deferring the notification disabling in canReadNotification()
  to the next notification cycle.

Change-Id: I29df32f12c9c80a325373af86963e924817f2167
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-03-21 17:53:18 +00:00
Anton Kudryavtsev
d804ea01f0 Fix build QtService.java: replace int with Integer
... and boolean with Boolean.

Task-number: QTBUG-51897
Change-Id: I498ed0cce48e2566c6800344677111dee225d7d9
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2016-03-21 17:30:45 +00:00
Rolland Dudemaine
83ebd5168f Add support for building for INTEGRITY using GHS toolchain.
Targets (xplatform) include integrity-armv7 and integrity-x86.

[ChangeLog][Platform Specific Changes] Added support for INTEGRITY RTOS.

Change-Id: If7827791e0a977ff198cb99e9dcc684a010bbb81
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-03-21 16:49:54 +00:00
Morten Johan Sørvig
0694751c33 Cocoa: Forward masked out mouse events.
Forward mouse events hitting the a masked out window
area to the next responder by calling the superclass
event handler.

Implement "inverse mouse grabbing": Qt will not take
dragged and up events if the mouseDown was in a masked
out area.

Change-Id: Ie86281245513cad515b77a468ac63f31ae41bfe0
Task-number: QTBUG-41839
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
2016-03-21 16:26:31 +00:00
Morten Johan Sørvig
68987d5454 Cocoa: Forward rejected key events.
Forward rejected key events to the next responder
by checking the return value from QWindowSystemInterface
and calling the superclass event handler.

This is useful when Qt is running as a plugin in a
host application; the host can now react to key
events even if Qt has focus.

Qt will often not accept keyUp events, even if the
corresponding keyDown was accepted, for example in
the case of text controls. We don't want to forward
'bare' keyUps, so keep track of which keyDowns have
been seen.

Change-Id: I976448a5d305a657a0e91aeb271b158f8b598286
Task-number: QTBUG-45768
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
2016-03-21 16:26:27 +00:00
Morten Johan Sørvig
820e69d6c2 Cocoa: Unify mouse handling logic
Reduce the code duplication for the various button
type handlers. Fan in: (example)
	rightMouseDown
	handleMouseDownEvent
	handleMouseEvent

The primary mouseDown function is still separate
with some duplicated logic.

Remove the "invalid button tracking" warning. qWarnings
are for application developers in case of improper
use of API etc, not internal Qt errors.

Change-Id: Idb1a311e37446399668c2a207831fccc84716ca1
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
2016-03-21 16:26:18 +00:00
Morten Johan Sørvig
3ee01f7403 Cocoa: Move window logging to qt.qpa.cocoa.window
Remove QT_COCOCA_ENABLE_WINDOW_DEBUG. Replace/Add
logging for window state changes and drawing.

The window identifier is now the QWindow (not the
platform window) everywhere since this object provides
more debug output.

Change-Id: I4ae56626015241279ab1b44d2b81c9d462b532a0
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
2016-03-21 16:25:53 +00:00
Liang Qi
f9e746959b Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7 2016-03-21 18:40:23 +00:00
Timur Pocheptsov
765eab5103 qsslsocket/qsslcontext - add ALPN (OpenSSL only)
Application-Layer Protocol Negotiation (ALPN) - is a reworked revision
of Next Protocol Negotiation (NPN) we have in our OpenSSL code.
Can be used as a part of HTTP2 negotiation during TLS handshake.

Change-Id: I484ec528c81d4887a64749095ec292dfaec18330
Reviewed-by: Richard J. Moore <rich@kde.org>
2016-03-21 15:01:12 +00:00
Rolland Dudemaine
686e37b1b7 Remove dynamically-loaded use of DNS lookup feature for INTEGRITY.
Static libnet is enough for DNS resolution.
This commit specializes the removal of dynamic DNS library load, but
this should probably also be done when using a static build.

Change-Id: I597bdd528649849844a0ee46d0706f22d6f595d4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-03-21 14:40:02 +00:00
M. Moellney
c228e01e12 Docs of qSetMessagePattern missing relation to qCDebug and co.
The documentation of qSetMessagePattern was missing links to qInfo() and
the category logging siblings: qCDebug, qCInfo, qCWarning, and
qCCritical.
This patch adds the links and adds a link to QLoggingCatergory class.

Task-number: QTBUG-51943
Change-Id: I85c1a205bfcd555cb0516f8cbdd157d8f20185b4
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
2016-03-21 13:48:10 +00:00
Oswald Buddenhagen
3d20e2e8d7 fix bad initializer for -optimized-tools
Task-number: QTBUG-51967
Change-Id: I5b4a3f0ff6358149bc338c6ac2e0b57638bdff7f
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-03-21 13:22:09 +00:00
BogDan Vatra
51e71d4111 Android: Fix inputItemRectangle when using EnableHighDpiScaling
When EnableHighDpiScaling is enabled, qGuiApp->inputMethod()-
>inputItemRectangle() returns the position divided by pixel density,
therefore all the controls positions must by multiplied by pixel density
to translate them into screen coordinates.

Task-number: QTBUG-52001
Change-Id: Iea92a912cfbab03a9497fc8cddc24bebd0db2192
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2016-03-21 12:16:19 +00:00
Andreas Holzammer
bc913ea452 wince: Adjust configure defaults
Remove outdated configure defaults to support features that get
autodetected.

Change-Id: Ia802ccd3fe9defa97e2667e81dff6e815a7b45b3
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
2016-03-21 09:55:26 +00:00
BogDan Vatra
c81db14297 QNX has no libdl, but all the functions are in libc
Change-Id: I3f4b32eb8bbc0a35e817399516daa02de358575d
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
2016-03-21 09:38:07 +00:00
Gabriel de Dietrich
e342a2e05f Add auto-test for crash in QCocoaBackingStore
This issue has been solved some time between 5.6 and 5.6.0.
We just make sure to protect against further regressions.

Change-Id: Ic3fdad901ed5f36792ae04b3d65047da95eea668
Task-number: QTBUG-50561
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2016-03-21 08:36:41 +00:00
Liang Qi
6cb8121a44 Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	src/widgets/styles/qgtkstyle_p.cpp
	tests/auto/corelib/io/qtextstream/test/test.pro
	tests/auto/corelib/plugin/plugin.pro

Change-Id: I512bc1b36acf3933ed2b96c00f476ee3819c1f4b
2016-03-21 09:02:57 +01:00
Gabriel de Dietrich
96740193e1 QWheelEvent: Make NoScrollPhase public
This reverts d5fde51410 and makes
that enum value the default for QWheelEvent::phase() with non
phase-aware mice.

[ChangeLog][QtGui] QWheelEvent::phase() returns NoScrollPhase with
non phase-aware mice. This is most mice and input devices except,
for now, Apple's trackpads and Magic Mouse.

Change-Id: I929fb39889cf116e89dcd134c1b1ec6587b8f05e
Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
2016-03-21 04:51:39 +00:00
Marc Mutz
e9dedb683a Remove unused QButtonGroupPrivate::notifyChecked()
It wasn't even implemented.

Change-Id: I7d4b97b176c90beeffc780c31848ec5b234ba509
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
2016-03-20 13:15:17 +00:00
Thiago Macieira
2e02de1651 Fix QtDBus deadlock inside kded/kiod
Whenever a message spy was installed, we failed to actually process
looped-back messages by queueing them for processing by the spy. That
had as a consequence that the caller got an error reply. Worse, since
the message had been queued, QtDBus would attempt to deliver it later.
Since that message had isLocal==true, bad things happened inside the
manager thread.

The correct solution is not to queue the message for the filter. If the
message is local, then simply deliver directly, as we're still in the
user's thread. This used to be the behavior in Qt 5.5.

Task-number: QTBUG-51676
Change-Id: I1dc112894cde7121e8ce302ae51b438ade1ff612
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Reviewed-by: Jan Kundrát <jkt@kde.org>
2016-03-19 17:16:52 +00:00