| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
backport of qt5 439002cddeb32766ea9806ac8b5cf9a973ed0f13
Change-Id: I2431ebd1240ba6f3c2b690b311301d222ec10865
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
| |
For fonts provided by fontconfig the FC_WIDTH will be mapped to
QFont::Stretch to achieve a more accurate font matching.
In Qt5 the font style is considered instead. This cannot be used
without breaking binary compatibility.
Change-Id: Ia519c2b70eb9f03ba0971fd6e8dd575169c7b72a
Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
|
|
|
|
|
|
|
| |
back ported from sha 539a024819a5f696b8afe899108b409f2b77549c
Change-Id: I3b4eac82c8d16076dc1987780512dcd93925e0b4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
| |
back ported from qt5 sha 2efccfeeef70ebd8a2db2ebccb3c63722ae76e1f
Change-Id: Ib9cdbb6e4bdfed8420cdc2364503445924c8c57c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
|
| |
In FcFontSort() the result parameter is not set in older fontconfig versions
(<=2.9.0), so this parameter is ignored. Some fontconfig objects are destroyed
after usage to avoid memory leaks. This is basically a backport from Qt5.
Change-Id: I557dbd5d7303cbd98becf169ebaa754e5d99c281
Reviewed-by: Wolfgang Bremer <wbremer@rim.com>
Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When calling eglMakeCurrent(), egl config and window format
must match, otherwise it fails with EGL_BAD_MATCH.
egl config and window format were static variables, this could lead
to a context setting the window format in the ctor but, at the
time of creating a surface, another context had changed the window
format.
elg config and window format are now member variables. This is the
same approach taken in Qt5.
Change-Id: I4fa0bc59273b856c1eaf43fafd15b551363f2fe2
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is supposed to workaround a race condition in the underlying
netstatus API: Sometimes we get an event that the Wifi interface
changed, but it is not up, e.g. no gateway (yet). In that case we need
to check back (currently: 300 ms) whether the interface has come
up or not.
This commit can be reverted again once the race condition in the
netstatus API has been resolved.
Task-number: QTBUG-29421
(cherry picked from commit 3dc47622a469ded1c99397fdedc2053b73d57189)
Change-Id: I252c39411340fe3f6af8440a8f21482ca9b6e62d
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
|
|
|
|
|
|
|
|
|
| |
Drop the read and write permissions for group and other users in the
system.
Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876
(cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5)
Reviewed-by: Richard J. Moore <rich@kde.org>
|
|
|
|
|
|
|
|
| |
Backport from qtbase d5257644302e349fec8df5750d100fd4918ddd6b
Change-Id: Ib46a8aecf5c4abe83d0161f72c480094002719e3
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
|
|
|
|
|
|
| |
Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QBBCliboard::setMimeData was not cleaning the system clipboard aproppriately
when m_mimeData != 0 but m_mimeData->userMimeData == 0, as it would return
early before the empty_clipboard() statement.
Also, we must not dataChanged() signal after the clipboard has been changed,
because this is done by the parent class.
cherry-picked from qt5/qtbase 0a977e36e06a69583d8e4edc27ca3df634c53404
Change-Id: I694490e26035d75c3c54e76c538982037c3ef799
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Implementation of QBBCursor, a QPlatformCursor subclass. Due to the lack of a
proper cursor API from the underlying OS, this class only caches the current
cursor position to make sure that the QCursor class works properly.
Backport from qt5 290ed7f8fafd67197f773454223410bbe57fc4d3
Change-Id: I1bb4b2b416579641d03ca5611e335322a8d81ae2
Reviewed-by: Bernd Weimer <bweimer@rim.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The keyboard mode is shared between applications.
You can reproduce this bug by clicking on a spin box,
it will open a number only keyboard, then close the application
and run an application that shows a text edit: a number only
keyboard will appear.
PPS keyboard already does this.
Backport of Qt 5 commit 019f9158e64ae24
Change-Id: I1ef8e32ae2958a604cfe618b765b23504997f0d4
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
| |
When a QLabel was displaying rich text, the raw html was being returned as
accessible name. Now the plain text is returned.
Task-number: QTBUG-27302
Change-Id: I2fc469b4ca8fc3584b849bbe0a94d094d727d04f
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
|
|
|
|
|
|
|
|
| |
Remove a reference to blackberry.json from the Blackberry bearer engine
plugin. This reference only makes sense under Qt5
Change-Id: I1592a17e38cb80b3fb138fc0538f3b4ea33739c8
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I7e991d4b1f7f3b5a51170e6ff09e293c4285ea26
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The buffer count check should take place right after buffers are created. For
some reason, the buffer count value inside libscreen may become incosistent during
the course of the program.
cherry-picked from qt5/qtbase 1b95d3331cb43fda36f92189ddce4e4c45bd47ea
Change-Id: Id542b3f8633ce118b0c125d47f3eda63ca31fe5e
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Should become more stable due to two changes:
1. When QAccessibleTextWidget::characterRect() calculates the height,
make sure the leading is not included.
2. Accept a small error (1) on height and width.
It there is an error on the height or width, dump diagnostics
This makes it pass with all Latin fonts on my system
(roughly ~150 fonts), where it didn't before.
Change-Id: I964207bad1f3ceb0103129501bdc857aff5885d2
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
libscreen will always provide the same physical screen dimensions
regardless of the initial orientation. Width and hight will now be
swapped appropriately (to make sure that the DPI value is correct).
The Qt5 implementation is different (the qnx plugin takes the
initial orientation into account).
Change-Id: I983d1db7ae334b442597b62dde64d41bb991690c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
|
|
|
|
|
|
|
|
| |
This bug is only in the Qt4 version of the plugin. In Qt5 attaching a screen works just fine.
Change-Id: I45ebc51c6da9999e7d2e4f453379fbc18dd6f857
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The problem is that isValid() should return true as
soon as we have a view widget.
That sadly means we need to verify that the model is still
valid whenever accessing it.
This is a backport of the Qt 5 patch
(I9237528abf2f5c75a73382525103307e9ca15f05)
Change-Id: I9237528abf2f5c75a73382525103307e9ca15f05
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Some interfaces might be connected but not working (e.g. no IP address,
no gateway etc.)
In practice, this prevents the USB interface (among others) from
being reported as active and thus the QNetworkConfigurationManager
as being reported as online.
We only want Wifi and 3G etc. connections to be reported as online
when they are up.
(cherry picked from commit b9551c1b47277d58d86a82ce15501663257ed9a1)
Change-Id: Ia175d701280db44a08b9535803a94806a5d6f30f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We are reading from the back buffer instead of
the front buffer when grabWidget is called.
This adds an override so that we query the front buffer
(the last rendered frame).
This change is not needed in Qt5 - the api there is different and grabWidget()
no longer exists.
Change-Id: I691ee589d56b60eab339de536b52fd90cee5ff85
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
While unlikely, there are cases in which QBBWindow::renderBuffer() is
called before the window buffers have been created. Without this check, the
program will abort on QBBBuffer constructor, since the value that will be
passed to it will be of an invalid buffer.
cherry-picked from qt5 c89dc4fdd2770ba3ad52303a2f4cb0c6403a2ecd
Change-Id: I1f1cde76a364480f3bc77eaaa59ca3cfba2eb618
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
|
|
|
|
|
|
|
| |
cherry-picked from qt5/qtbase d8c8057c03fc906f3bee0905246ca18351bd9e1b
Change-Id: I6728307150c75a8e01f498cf55320a2956aa07ad
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
|
|
|
|
|
|
|
| |
The qnx plugin in Qt5 is different, update is not needed
Change-Id: I70cf6a0b091bd1f15795521397eb744401aff2c8
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backport from Qt5: Watch for display events from libscreen,
and dynamically add and remove QPlatformScreens
(and hence QScreens) in response.
Qt5 commit: 1f0d430c3a660c9e72581b582fe16c440bcf9eac
Change-Id: I65f69fc9eca5b32b0aa0e929d09837a6f01385d0
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Try to retrieve the device's real screen size and provide override
options in case the target's low level stack reports wrong values.
It can happen that the system is reporting a screen
width or height of zero, if the system does not know the
size instead of returning an error. You can either
set a define QQNX_PHYSICAL_SCREEN_WIDTH/QQNX_PHYSICAL_SCREEN_HEIGHT
or set it as environment variable QQNX_PHYSICAL_SCREEN_SIZE.
The preference order is:
1) Take detected size
2) Take size from env var
3) Take defined size if any define is set
Backport of 0b0e28997d5c0ec6fbffa839b0ceb57b55104f9c
Change-Id: If24a5d32ec9081fe006344bf30bbb917418c9071
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
| |
We only use that PPS object for reading.
In Qt5 this file is not used anymore.
Change-Id: Ibdfd74f7b7a065ade45b275cb12dd67ddecd0736
Patch-by: Nick Ratelle
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This event can be used by any platform plugin to implement
special application panels/overlayed menus.
Currently used by QNX only.
This replaces sending fake Qt::Key_Menu presses in the QNX
plugin. Qt::Key_Menu is already used when invoking context
menus with the keyboard.
( backport of qtbase/9695df4d44b228e7e778ff17d5cccac30967b1fd )
Change-Id: Id5cf96758f1104f454a2bb977b367d09d4685b62
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This was triggered by using a QVideoWidget without a parent.
This patch is not necessary in Qt5, as the API there is based
on QWindow, it has no call to nativeParentWidget().
Change-Id: I2fe2b872da314e507bcfcb69dfea4a837700ac71
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
|
|
|
|
|
|
|
| |
Change-Id: I45f7894f7e79617b6ccb8caa464bbbffaf9dd7b5
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There are cases where a widget has a parent, but is also a toplevel window at
the same time, causing the system window to have no parent.
For instance, a QMenu usually has a QMenuBar as a parent, however QMenuBar
itself does not have its own platform window, as opposed to QMenu. Thus
QMenuBar::parent == QMainWindow (for example), but QMenuBar::platformWindow ==
0x0; QMenu::parent == QMenuBar, but QMenu::platformWindow != 0x0 (which is
QMenuBar's value).
cherry-picked from qt5 04d296d64118ba2d647668494872d93cc1ef7ed1
Change-Id: I9304c5c9e64dca012a1903de7c80c168a701a5ea
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
removeFromParent() must not be called from raise()/lower(), because it wrongly
sets m_currentParent to 0, causing the parent/child link to be broken after a
call either of these methods.
This is a backport of
qtbase commit 4c33efc3228d82a82e13fe8c196b8c74a4998572
Change-Id: I5970cd2b2e0d58ef01dd99c10748195220d0e006
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
| |
This is a backport of
qtbase commit d162f276714f04b07827dfd525deea45dc55a5f1
Change-Id: I3ae3994d305eebd61773e175332cecfa1d9cde51
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The format of the PPS object has changed, it is now prefixed with
[n], so be more leninent in parsing to support both formats.
This is a backport of
qtbase commit fda3fac1d276952ddac4f5a916339db1940082d5
Change-Id: Ibb9b2bef150ca184e2bb234e55e04975552f10b1
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This makes it clear that the mChildren size must be 0 at this point,
indicating otherwise an inconsistency in the logic of the child windows
management.
cherry-picked from qt5 72d7a833bd6cd2074f45c1ea32986d498b6dd476
Change-Id: I7c0eb9b1b1121b708badb46bd423de0e75d206a6
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
|
|
|
|
|
| |
- Assigned/Unused variables.
- Unsigned comparison >= 0 is always true.
- Constructor initialization order.
- Signed/Unsigned comparisons.
Change-Id: I1f9edab0506573420ed0bf3055252ba48625c8eb
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
| |
This patch is not needed in Qt5, as it works as expected.
Change-Id: I3d165c3f5b8562207af20a0564c3884270d17b44
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There are two types of rotation to be considered:
1. Rotation of native widgets
The corresponding window should be rotated and resized proportionally to the
new screen geometry.
2. Rotation of toplevel windows.
The window will be only rotated. It will be only moved or resized if it
becomes clipped, in order to be fitted on the screen properly.
cherry-picked from qt5 89d9f8fe949e65e7455fabe288ea284aa6de06b1
Change-Id: I837da53f1a12a7b8aff1e0e9d6f4579e3aefaf2a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
|
|
|
|
|
|
|
| |
Backport of 3f407cddf8b1d5fc09b414dbecd9a47d30e3abe7
Change-Id: Id7fd3ca76793d8d3e3698dd402fe31e04567e938
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
|
|
|
|
|
| |
QDirectFbWindowSurface::resize() must call parent
QWindowSurface::resize() method in order to update QWindowSurfacePrivate
size.
Change-Id: Icd605dc1923f2560579ccb2e4f800c80ff7e92fd
Reviewed-by: Holger Freyther <holger+qt@freyther.de>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
|
|
|
| |
Change-Id: I6f83b1223b7bd57b5dfc46fe5bed276269b1a676
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
|
|
|
|
|
| |
Extend drawPixmap capabilities for qpa through new OpacityPixmapCapability
QBlittable flag and add related implementation in DirectFB platform.
cherry-picked from qt5/qtbase 4ae829c1dbd0e8a72b82ab4c6cddb0a4ffe009f6
Change-Id: I8abdb0fa72bc030d769190d7cba40561007e7b46
Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Add non-opaque fill support for qpa through new QBlittable flag
"AlphaFillRectCapability" and add related implementation in DirectFB
qpa platform.
cherry-picked from qt5/qtbase aab15782e21bf0aaea7f2211278e9aa9fc78c6d7
Change-Id: Ia1c74c2926d2e244290dcb62cbd3b6848ba95707
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I6b7a5b4d698d496a6710dd479b24f10c7d7e5851
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Don't attempt to register for events from non-attached screens.
Backport of commit 9597e0d2a23c4673aea7a74598a6a634527c443c
from qt5/qtbase
Change-Id: I95859abc476f43308ba9b2c684b8eaae731c59f6
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
An implementation for BlackBerry devices based on the BPS netstatus APIs.
cherry-picked from qtbase df7a1a28aaab31
Change-Id: I979f594aca64315af1f39e68886b819f7f215f6b
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Vladimir Minenko <vminenko@rim.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: Iec3efb4b91bdba33fe93b928ff2349440e15aa35
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
|