| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Move to fromFile to load Qt resources for two reasons. The
first is that ::fromData creates a QBuffer on our raw data
and is passing that to the QImageReaders. Right now we there
is a QFile -> QByteArray -> QBuffer transition that wastes
cycles. The other reason is that QPlatformPixmap::fromData
did/does not check if the decoded image is null and might
cause a crash because of that.
Change-Id: I800bfe4cd9b5d6a0d3531ed33f4228770703e94f
Original-Id: I7cb92d84874323e7205ab28883cc0fe9ecca1e27
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Separate PPS based navigator event notification handling and implementation
of the actual event handling.
Like the similar refactoring for screen events, this will allow to reuse the
same event handler class for BPS driven event processing.
Backport of 4fac40f8b0e7b2a6f5f41eb82196e8b197bc851a
Change-Id: I6896645aedd20e96fdabc7c49c7bd1d762de788f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
| |
Change-Id: Iacf8ef2032d5c229a7483d6993120684ee9bb04e
Reviewed-by: Jeremy Katz <jeremy.katz@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Have the navigator event handler emit the new rotation as a signal argument
and let the screen class handle all parts of the change, i.e. also notifying
the window system about the geometry change.
This also allows to rotate all screens, not just the primary screen, if this
should be necessary.
Backport of 45b7b0599cd1ebdfe17487215b36ff766068f0e8
Change-Id: Ia3e3ff321bc2d7a23e64950d15d88d007f9766dd
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
|
|
| |
The window group is needed by QtMobility, as the BB multimedia
API requires the window group when creating a video overlay
window
Change-Id: Ifc029c31b5a1750631a6b397f7c33aa31e483c81
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We're not the only one creating native windows. When using the
multimedia API, the multimedia library creates a video window
for video display. Here we need to deal with giving this video
window overlay a proper z-order, otherwise it will never get
visible.
Cherry-picked from qtbase 4efd61c3cf3d25db1c60bf5c842837c5b24a05fa
Change-Id: If2e2a6e51ae6553fdf645e578f68e41c7b43336a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
| |
Cherry-picked from qtbase b5f343b3677a7c7f09d91d7d60f310717325e840
Change-Id: Idf7176bd83215f1251c1e2200a5bf0168adfe523
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
| |
cherry-picked from qt5/qtbase: d5bc8ab811f380116c5a55a777150bc47a43a6bb
Change-Id: I8d2f906c52ae56ec5cfce70f94ec3661e7d0e15f
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Allows us to create a BPS based implementation and drop it in
without further changes to users of the interface.
Backport of 831943d7f12addef79fb536e5550da0f72480217
Change-Id: Ib047f4bbc68743cfe8c2293a235d4e9ca8195af9
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The event handler class can then be reused when we have proper
BPS event support available from corelib
Backport of a80a2c6da241dac77f533bc702a1c7d94349a812
Change-Id: I9f8f661ca6b976aa02990bc8c8af8e5472e5faa4
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Getting rid of the singleton gives us better control over when the
virtual keyboard handling class is instantiated and configured.
Also notify screens about keyboard height changes and let them
notify through QWindowSystemInterface instead of "guessing" the
screen in QQnxVirtualKeyboard.
Backport of 5d117fd427e3e727df5d3f417a2b91366f2a31c1
Change-Id: I49c1a6af5decca47a5ab3ba382430a2b25578d40
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
| |
Change-Id: I10506b83efda8efb12ccc531f60cd4cd9b4b5bc9
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
|
|
| |
Refactor from polling in an endless loop running in a separate thread
to using a QSocketNotifier working on the main thread.
Backport of 29518b04a619fdd7784e88eebe687fb87ae8a8b5
Change-Id: I8993b874f1543d5e85b0911c81a7a9ec072e5160
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
|
|
| |
Removes the need for an extra thread by creating the event handler's
socket notifier in the context of the main thread.
Backport of 9dc86ac0f2d019f93665c1ae0e3c2cd33fd88bce
Change-Id: I5c31d904191f45698085e8fd576481018e072ef4
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The mask of possible mouse buttons in QNX provides tracking for the
up/down State of up to 8 mouse buttons. This update adds support
or 2 of buttons which we previously ignored in Qt on this Platform.
Backport of a0933f4d7485d22f38b80c67f79b8d3f721b19a2 in Qt5/qtbase
reduced to the 5 buttons Qt4 has support for
Related to task-number: QTBUG-24682
Change-Id: I4253b96b2d7ed3f806749432b2eb7f884fd0f580
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
|
|
|
|
|
|
|
|
|
| |
Event driven listening for navigator events, basically a backport of
the respective QPA plugin code in Qt5/qtbase
Change-Id: I120a755af614d35a9e5a0e755c521bbf8bf0d13d
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
| |
cherry-picked from Qt5/qtbase 4ba895a86
Change-Id: Ic15d00df4b83d4510ea9622d74e988515fbfbae5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Derive a data accessor class from QMimeData so application level code can
query MIME type availability through it or directly attempt to fetch
data by MIME type even if the type is not yet known to QBBClipboard.
Also make sure any MIME type used by the application in setMimeData
operations is checked for availability when being queried for formats.
This is a backport of 08cc2d27794e6bafb75cdc35b6966def35f9facb in master of
Qt5 qtbase
Change-Id: I86455cfb58e2e00ac3e992a8228ee7167f8d2a20
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
| |
Similar to the code in gui/egl/egl.pri.
Change-Id: I1dbcf6f0d70405d8dc9f404bfed64fdfcd7c14ab
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Needed to automatically show/hide virtual keyboard when focus changes
in or out of an input widget
Change-Id: I21325452938e1d551bcc4421721f3bc5d85c5fbf
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Nick Ratelle <nratelle@qnx.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The application root window is at z-order == 0, all platform windows created
for Qt windows are its descendants, so their base value for z-order needs
to be 1.
Backport of qtbase 117bdad3f270a4c0589cff332a7a8e904263de08
Change-Id: Ic1fb91c30559177bc094a5db96e4088860a8d6ac
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Nick Ratelle <nratelle@qnx.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Country and language values were assigned to in the case of decoding failure
but left unchanged in case of success. Thus members mLanguageId and mCountryId
remained at "en" and "US" respectively instead of being changed to whatever
the keyboard sent.
Change-Id: I9f48a55d3c431458426c5c4da8e69600948f219b
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Nick Ratelle <nratelle@qnx.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: Ia756609ed4406deacf92e15b4e6591a91ef5c8a6
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Nick Ratelle <nratelle@qnx.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Build fix on platforms having xcb-icccm >= 3.8
This is a backport of 7ce8491280990350162933a0716d1b014f65aeb6 and
f005dee1b3692a09e47782dcff9b5b07aa659b51 from qtbase.
Change-Id: Ic6cbb555335a74cc7b00273081c249aa7e08afaf
Reviewed-by: Holger Freyther <holger+qt@freyther.de>
Reviewed-by: Donald Carr <donald.carr@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
| |
This lessens unnecessary delta between the two.
Change-Id: I3bb33d977573e3404dd08c2f4e396d18dd63ddc7
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
|
| |
Change-Id: Ibc883be9af145eafef2e5ff9eb82c3364bace331
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
| |
Change-Id: Ib13737eac7f7cee3ebca44aa712cb6b152672a81
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
| |
Change-Id: I284199e0f0e77d28e1c72be1aaae1a9ac7c0f465
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
|
|
|
| |
The test assumes that the "strings" command in the PATH is able to
handle target binaries, which fails. Just specify explicitly.
Change-Id: I8488cb8e71f47f564dfb1790c505e94b2d4a7def
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
| |
This is copying the files (minus the API changes) to Qt 4.8. It fixes
memory leaks, adds DirectFB based image decoding, prepares EGL integration/
Merge-request: 1492
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
By default QPixmap may not hasAlphaChannel(), only if setMask()
or fill() with a transparent color is called a QPixmap will
hasAlphaChannel().
Make the QBlittablePlatformPixmap remember if there is an alpha
channel, pass this as parameter in createBlittable to make it
clear that this is required and not optional.
Update the DirectFB plugin to handle this parameter to create a
RGB32 or ARGB Surface depending on the alpha value, also only use
PreMultiplied alpha when using ARGB. Separate the two constructors
for the QDirectFbBlitter to either adopt a DirectFB Surface or to
create one.
Cherry-picked-from: qtbase:ab50b60f5cc237d5620f3ff3b2eb44c857f8f60b
Change-Id: I8abf82408ecd2d075fc6f241ace8be2a34ac56e7
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Merge-request: 1492
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Set execution bits for more scripts.
Set execution bits for .test files.
Fix more permissions (no execute bit).
Fix permission (no execute bit).
QGraphicsLayoutItem - bound constraint the minimum and maximum size
Notify X11 of its resizable state through MWM Hints.
|
| | |
|
|\ \
| |/
|/| |
|
| |\
| | |
| | |
| | |
| | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
Doc: Fixing typo
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Reducing the amount of spelling errors from NBN.
Change-Id: I9b228bb95b4a757cff57595125009e70b0097d86
Reviewed-by: Rohan McGovern
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 1331
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 1331
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
don't crash when destroying the shortcuts
Disable activeqt on win32-g++ (it doesn't build).
fix warning
remove unused functions
Make the DBus timeout configurable in QDBusAbstractInterface.
Fix a typo in qt-conf docs.
Revert "Fix build with the Clang compiler"
Added missing no_include_pwd check
Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'
Fix build with the Clang compiler
Change spacing of title in offline style.
Add support for rawFonts loaded from data in FaceId
examples: fix compilation with namespaced Qt.
Russian translation update
Update Japanese translations for Qt 4.8.
directfb: Include directfbgl.h directly
tests: fix QNetworkProxyFactory test
don't detach until the list is going to be modified
optimize QList::removeAll()
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
tools/qdoc3/cppcodemarker.cpp
|
| |\ \ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
directfb.h is included directly in all other files, include
directfbgl.h without the directfb/ prefix as well.
$ pkg-config --cflags directfb
-D_REENTRANT -I/home/foo/install/directfb/include/directfb
Merge-request: 2643
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \ \ \ \ \
| |_|_|/ / /
|/| | | | | |
|
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Using the first pkg-config in PATH is prone to errors when
cross compiling. This is a known issue, and `configure' already
avoids using pkg-config for cross compiling (unless -force-pkg-config is
used). However, there was previously no way for a .pro file to test
whether or not the user had passed -force-pkg-config.
Let !contains(QT_CONFIG, no-pkg-config) be used to test whether or not it
is safe to run pkg-config.
|
| | | | |
| | | | |
| | | | |
| | | | | |
This is actually not needed if done correctly.
|
| | | | | |
|
| | | | | |
|
| |/ / /
|/| | | |
|
| | | | |
|