summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* SQL TDS fix missing override keywordAndy Nichols2016-06-281-1/+1
| | | | | | | Plugin failed to build with clang due to missing Q_DECL_OVERRIDE Change-Id: Idad54f3f0ea7403c388b39189d86cfab10f9fb04 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Limit the number of targets the VNC platform plugin is be built forAndy Nichols2016-06-281-1/+3
| | | | | | | | | | | The VNC platform plugin is a port from the 4.8 code, which only supported embedded Linux. Right now that is the only platform this is tested with so unless there is a need for other platforms to be hosting applications over VNC we should limit it to only being built on unix platforms that are not Android, or Darwin. Change-Id: I49407669ee8ca6e9e3ed95b5bb350c7730839cf8 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Cleanup VNC platform plugins debug messagesAndy Nichols2016-06-285-31/+25
| | | | | | | | | | | There were many development debug statements still intact, so now they have been removed. Some Debug messages were turned into Warnings when it makes sense to warn the end user of something. The rest of the useful debug messages were converted to be in the qt.qpa.vnc logging catagory. Change-Id: I8e9525f02794ab5eccd4c8fcbc2b1f7c9c25b482 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Add plugin arguments to VNC pluginAndy Nichols2016-06-285-16/+34
| | | | | | | | | | | It is now possible to specify a port number to run the VNC server on, as well as the screen properties: Logical Size Physical Size Depth Change-Id: I79b38c6e37ad5abb5e158eca9a17d7e8a86e692f Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Support multiple connected clients in the VNC pluginAndy Nichols2016-06-287-729/+951
| | | | | | | | | Previously it was only possible for one client to connect at a time. Now it is possible for multiple clients to connect to the VNC server and view and interact with the application. Change-Id: I886583a3abea2955367bf2da490127b041b5c5fb Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Enable compilation of the VNC QPA pluginLars Knoll2016-06-281-1/+1
| | | | | | Change-Id: I15e63638efbb613357f07015fee1955782970a6c Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Support for client side cursors in the VNC pluginLars Knoll2016-06-284-30/+37
| | | | | | | | | Client side cursors are a major performance optimization, avoiding the need to transmit images to the client just because the cursor has moved. Change-Id: Icdf4ff948571d39d82c86d251bca46390889d02f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* cleanups in the VNC pluginLars Knoll2016-06-283-163/+10
| | | | | Change-Id: Iac930d3c7036b285ff5003691bfecf6071795d54 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Support showing the mouse cursor in the VNC pluginLars Knoll2016-06-283-4/+10
| | | | | Change-Id: I380e36b3a814db7ba779d998260d1a75d1d20e0c Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Implement support for key events in the VNC pluginLars Knoll2016-06-281-3/+2
| | | | | | | | Make sure we receive key events from the VNC client and forward them to the app through the QPA interface. Change-Id: I8d44d614670ec753e35ff36fa3ef2d74b07f4bbc Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Properly forward mouse events to the VNC clientLars Knoll2016-06-282-8/+6
| | | | | Change-Id: I3cee27bab4cd81079adedf3968ac4dfebf43aa11 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Initial work on a VNC QPA pluginLars Knoll2016-06-289-0/+2454
| | | | | | | The basics work and the VNC client is showing pixels Change-Id: Ie31efce2f31dd5f57af209dcc9c8f9aace730afd Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Windows QPA: Restrict expose workaround to non-Aero themes.Friedemann Kleint2016-06-281-2/+7
| | | | | | | | The workaround may cause flicker, so only use it when necessary. Task-number: QTBUG-7865 Change-Id: I813aa0669727303bc947a85a8893a90f29d3ff24 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* QGtk3FileDialogHelper: respect QFileDialogOptions::ReadOnlyJ-P Nurmi2016-06-271-0/+3
| | | | | Change-Id: I982dd10632760fe91b89ade30d79f97f27d17dcd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-232-21/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/mac.conf mkspecs/features/configure_base.prf mkspecs/features/configure.prf mkspecs/macx-clang-32/qmake.conf mkspecs/macx-clang/qmake.conf mkspecs/macx-ios-clang/qmake.conf src/network/ssl/qsslsocket_openssl_symbols_p.h Change-Id: I768b592e8e589662b1fdb9b8cbd633fef26845b6
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-232-21/+6
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/angle/src/libGLESv2/libGLESv2.pro src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp Change-Id: If8da4cfe8f57fea9f78e7239f378a6302c01674e
| | * eglfs: Fix static builds with kms backendsLaszlo Agocs2016-06-211-20/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logging category symbol clashed when linking applications with both kms backends present. This is no longer an issue in 5.7 where the symbol is in the shared kms support lib, but for 5.6 we need to use a different symbol name. Change-Id: I3c323109d6c498e044289455b3d31567a4d5928c Reviewed-by: Ralf Nolden <nolden@kde.org> Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| | * UIKit: Treat windows as exposed only during Qt::ApplicationStateActiveTor Arne Vestbø2016-06-212-21/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We previously treated Qt::ApplicationStateInactive as a valid state to expose windows in, to prevent a visible flash of black screen at app startup between iOS hiding the launch screen and Qt drawing it's first frame, but this lag is no longer an issue, so we can apply the best practice of only rendering during Qt::ApplicationStateActive. This may prevent crashes during application suspension. Task-number: QTBUG-52493 Change-Id: I271281ed6fb857e6849cdb88cc2d8251d1bba1df Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/devLiang Qi2016-06-2115-171/+242
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-2115-171/+242
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qsysinfo.h src/corelib/kernel/qcoreapplication_win.cpp src/gui/text/qdistancefield.cpp src/gui/text/qdistancefield_p.h src/plugins/platforms/windows/qwindowsglcontext.cpp src/plugins/platforms/windows/qwindowsglcontext.h Change-Id: Ib3500acc2b28553bde06758cd9a2e19eb7fe2978
| | * | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Liang Qi2016-06-2013-166/+236
| | |\ \
| | | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-2013-166/+236
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And blacklisted a few tests in tst_QUdpSocket. Conflicts: src/android/jar/src/org/qtproject/qt5/android/QtNative.java src/corelib/global/qglobal.cpp src/corelib/global/qsystemdetection.h src/corelib/io/qfileselector.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp tests/auto/network/socket/qudpsocket/BLACKLIST Task-number: QTBUG-54205 Change-Id: I11dd1c90186eb1b847d45be87a26041f61d89ef6
| | | | * Fix build on macOS: Apple changed their minds if null is allowedThiago Macieira2016-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qcorewlanengine.mm:88:37: error: null passed to a callee that requires a non-null argument [-Werror,-Wnonnull] currentInterface = [CWInterface interfaceWithName:nil]; ^ ~~~ Change-Id: Ie7d159a97176ca53161423cfcddba547e735d5b3 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | | | * eglfs_kms_egldevice: fix warnings about -Werror=maybe-uninitializedLiang Qi2016-06-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp: In member function ‘bool QEglFSKmsEglDeviceIntegration::setup_kms()’: src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp:391:28: error: ‘encoder’ may be used uninitialized in this function [-Werror=maybe-uninitialized] m_drm_encoder = encoder; ^ src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp:392:29: error: ‘connector’ may be used uninitialized in this function [-Werror=maybe-uninitialized] m_drm_mode = connector->modes[0]; ^ cc1plus: all warnings being treated as errors Change-Id: Ic444450d06a6dd8047bd6871febb08a4a3fde6f9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | | | * UIKit: Detect swapBuffers on non-exposed windows and skip flushTor Arne Vestbø2016-06-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using threaded rendering the render-thread might be half-way into rendering a frame when the application is backgrounded, resulting in the following swap happening on a non-exposed window. This may result in the system killing the application, as rendering is not supposed to happen when an application is backgrounded, so we skip the flush. Change-Id: I9ab8f2c4617391fd827558af9fb473f1734b3688 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| | | | * UIKit: Ensure that Qt's application state is initialized at startupTor Arne Vestbø2016-06-172-95/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using dispatch_async to deliver the initial application state at startup was broken, as that would leave the application in the default application state, inactive, until the next runloop pass. This became a problem when an application was started backgrounded, eg. in response to location updates or a Bluetooth accessory waking it up, as it would have a small window of time at startup where it would think it was able to render content (since the window was exposed), while in fact the application was running in the background. iOS will in these situations kill the app for doing background rendering. Change-Id: I1ab4a6af08a154d8625c6451b4b5c8f4453e6b43 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| | | | * UIKit: Don't reallocate renderbuffer on QIOSContext::swapBuffers()Tor Arne Vestbø2016-06-174-67/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During device rotation, the backing CEAGLLayer of our custom UIView is resized by the system. Normally this is the time where we would then reconfigure the corresponding renderbuffer that we render to, which shares memory with the CEAGLLayer, but we chose a lazy approach where we'd defer the reconfigure until client code actually called makeCurrent. This caused problems because not only did we implement the lazy reconfig in makeCurrent, but in every QIOSContext function that operated on the default FBO, including swapBuffers(). When using threaded rendering, such as in Qt Quick, the render thread may be half way in rendering a new frame when the system resizes the CEAGLLayer, and we pick up that resize on the swapBuffer call and allocate a new renderbuffer, before flushing the queued up GL commands that were operating on another renderbuffer of a different size. This resulted in the following crash: 0 - gpus_ReturnObjectErrorKillClient() 1 - gpusSubmitDataBuffers() 2 - glrFlushContextToken() 3 - flush(__GLIContextRec*)() 4 - QIOSContext::swapBuffers(QPlatformSurface*) ... We solve this by still being lazy in how we reconfigure, but limit the reconfigure to makeCurrent(). If the CEAGLLayer is resized in between two frames, we skip the half-drawn frame. The old frame will then be scaled to match the new size by the system, but this is preferable to flushing a new frame that may have been drawn with two conflicting window geometries. Task-number: QTBUG-50017 Change-Id: Ie229f26d156dfbfc7ed8d9efd0eb5e992eee73f1 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| | | | * uikit: Deliver update requests via CADisplayLink callbackTor Arne Vestbø2016-06-174-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves performance over the default timer-implementation, and allows us to control the rate and paused state of the display link. Change-Id: I05761b6eb48f5e91af35735e2faa477427cd8440 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| | | | * correctly link xcb-static libOswald Buddenhagen2016-06-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this apparently makes no difference except for not creating bogus .prl files - presumably, the correct path is coming from somewhere else already. Change-Id: Ia3f3c44e506ba14b533ff097f05acecf1e86cfb3 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| | | | * TuioTouch: Report empty touch areas for the cursorAlexander Volkov2016-06-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently TuioTouch plugin reports touch areas of size 1x1. It's inconsistent with the platform plugins which report empty touch areas when their size is unknown. Change-Id: Iea8ad38a5712b666126780411380d963877b0229 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Ariel Molina R <ariel@edis.mx> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| | | | * Android: Don't send tabletEvent when it's not supportedVyacheslav Koscheev2016-06-161-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QT_NO_TABLETEVENT defined, then there is no sense to create tablet events. Its better to create general touch events in this case. Task-number: QTBUG-53887 Change-Id: I2fabc2241158d54d6c39a2f6071ab874f7debd39 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * | | Fix ICC warning about comparing pointers of different typesThiago Macieira2016-06-192-9/+9
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | error #3781: comparing a pointer to void and a pointer to a function is nonstandard Change-Id: Ib57b52598e2f452985e9fffd1458fd651d3985d2 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | Improve QGtk3FontDialogHelper::onAccepted()J-P Nurmi2016-06-201-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call currentFont() only once. It does a conversion from a Pango font description string to a Qt font, so not entirely trivial operation. Change-Id: Ic67b7c5b0874621c51a5cce4766acd4243d3dfde Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | QGtk3ColorDialogHelper: ensure currentColorChanged() gets emittedJ-P Nurmi2016-06-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GTK does not emit the "color-activated" signal as expected, so make sure currentColorChanged() gets emitted the same way it's done for QGtk3FontDialogHelper. This ensures that QML bindings get re-evaluated as appropriate. Change-Id: Id00f144e8b9a08afee57ef6a6033972cdc4307b0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Restore use of ifdef for TVOSMike Krus2016-06-201-2/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | UIScreen.applicationFrame is not defined at all on tvOS. Was broken by 88ebee5cd7fe2416775b12b25498ac86ac4d9af8 Change-Id: I692f464d538561961b40a6fbdcab51a3320e5779 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* | | TuioTouch: Report empty touch areas for tokensAlexander Volkov2016-06-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently TuioTouch plugin reports touch areas of size 1x1. It's inconsistent with the platform plugins which report empty touch areas when their size is unknown. Change-Id: I253e4f7a95e8fb3ecc76c809a9be2afe3c976bef Reviewed-by: Ariel Molina R <ariel@edis.mx> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-173-6/+6
|\| | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp Change-Id: If899cda251b4dc8b8a7c6764520e88ab719737cd
| * | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-163-6/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qsimd_p.h Change-Id: I7c6bfc5873d97ad7f51a540dd9c18b9359dde59f
| | * | Use void instead of uchar in the endian-swapping function parametersv5.7.0-rc1Thiago Macieira2016-05-263-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to pass pointers to storage that is not an array of uchar, which it hardly ever is. Change-Id: Ifea6e497f11a461db432ffff14490d2c2df21906 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| | * | Merge remote-tracking branch 'origin/5.6.1' into 5.7.0Liang Qi2016-05-261-3/+9
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qsimd_p.h src/network/socket/qnativesocketengine_winrt.cpp Change-Id: I2765b671664c2a84839b2f88ba724fdf0c1fa7c6
* | | | | Cocoa integration - inconsistent window types/stylesTimur Pocheptsov2016-06-162-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NSWindow does not support 'utility window' style, but NSPanel - does. If we first create a normal widget, then later make it a Qt::Tool, we still have NSWindow with (now) invalid 'floating panel' window level (but no 'utility window' style) - it's a window that stays on top even when we switch to a different application. Change-Id: I691bc6f681cdf8bc2a9637444da33e7e6200ee2f Task-number: QTBUG-45938 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | | | | Implement QPA menu for GTK+ 3.xJ-P Nurmi2016-06-155-0/+667
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGtk3Menu provides native stand-alone context menus, which is not covered by the recently introduced QDBusPlatformMenu (limited to global menubars and system trays). Change-Id: Ida42ebaf69444e6b3150dc0ccf9b44e80cf71c20 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | | | eglfs: Fix module names in EGLDevice backendLaszlo Agocs2016-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The refactoring in ec4eb4db61094179bc6a9ec26ec68fb710177053 contained some typos, apparently. Change-Id: I92b24750f498b2548ef0668839c3db21d5a0e320 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | | | uikit: Remove use of ifdef when resolving available screen geometryTor Arne Vestbø2016-06-141-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More explicit that we're falling back to m_geometry on non-iOS platforms. Change-Id: I09bd5270aee5edb977983893a8407218eea0f74a Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | | | darwin: Add Foundation conversion functions for QSize/QSizeFTor Arne Vestbø2016-06-144-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fromCGPoint function was left out for QSize, as the foundation type is using CGFloats internally. Clients should use an explicit QSizeF::toSize() when potentially throwing away precision. Change-Id: I12d43ae0881f09ad8d79f2caaa000c3983f4ef30 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | | | darwin: Add Foundation conversion functions for QPoint/QPointFTor Arne Vestbø2016-06-144-21/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fromCGPoint function was left out for QPoint, as the foundation type is using CGFloats internally. Clients should use an explicit QPointF::toPoint() when potentially throwing away precision. Change-Id: I12a37e8f81c86b7ada56066cc18ee29709cc21e3 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-1328-149/+1318
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config_help.txt configure mkspecs/features/uikit/sdk.prf src/corelib/global/qhooks.cpp src/corelib/io/qfilesystemwatcher.cpp src/corelib/io/qlockfile_unix.cpp src/corelib/tools/qalgorithms.h src/gui/kernel/qwindowsysteminterface.h src/gui/text/qtextdocument_p.cpp src/network/access/access.pri src/network/access/qnetworkaccessmanager.cpp src/network/access/qnetworkreplynsurlconnectionimpl.mm src/src.pro src/testlib/qtestcase.cpp src/widgets/kernel/qwidgetbackingstore_p.h src/widgets/styles/qwindowscestyle.cpp src/widgets/styles/qwindowsmobilestyle.cpp tests/auto/corelib/io/qdiriterator/qdiriterator.pro tests/auto/corelib/io/qfileinfo/qfileinfo.pro tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp tools/configure/configureapp.cpp Change-Id: Ibf7fb9c8cf263a810ade82f821345d0725c57c67
| * | | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-103-13/+18
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/macx-ios-clang/features/default_pre.prf mkspecs/macx-ios-clang/features/sdk.prf mkspecs/unsupported/freebsd-g++46/qplatformdefs.h src/widgets/styles/qgtkstyle.cpp tests/auto/corelib/io/qdiriterator/qdiriterator.pro tests/auto/corelib/io/qfileinfo/qfileinfo.pro Change-Id: Ia943555d1e59234a66f7dc65bdfda838e40001b5
| | * | | uikit: Call base class implementation of rotation callbacksTor Arne Vestbø2016-06-101-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Apple documentation explicitly says that you should call super when implementing these methods. Change-Id: I584bb140a4a5bde88927b379ab19158a78c6fea9 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| | * | | xcb: Fix transient parent and "Qt::Window" flagBłażej Szczygieł2016-06-081-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't set transient parent property when Qt::Window flag is set. Delete transient parent property if a window doesn't have a transient parent. Force setting standard window flags for Qt::Window only if there are no other flags. Amends 98c10a02c5b77e023471ad6993dc66b013889cfb Task-number: QTBUG-52550 Change-Id: I68ee715b632487e9dd0e7ffbbfc0c2cdd0f0e151 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>