summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2013-06-0518-114/+215
|\ \ | | | | | | | | | refs/staging/stable
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-0518-114/+215
| |\| | | | | | | | | | Change-Id: Ic6e1ae60f891a6b2b568936204d2e84db4177fb4
| | * remove pointless symlink fallback for qconfig.hOswald Buddenhagen2013-06-051-3/+0
| | | | | | | | | | | | | | | | | | | | | syncqt does that nowadays. Change-Id: Iffc465cce86a7c6370afaa543ba9b9ed8d478eea Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * don't add absent private include paths to non-git buildsOswald Buddenhagen2013-06-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | all private headers are created by syncqt (and are thus in the source dir), so we can simply override the normal (build dir based) paths instead of extending them. Change-Id: I9c1f3344c401b481b3f3d2295515f1aabffaa9a0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * fix non-git non-shadow non-prefix non-qtbase buildsOswald Buddenhagen2013-06-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | these builds usually assume all headers in the qtbase build (== source == install) dir, so the path for adding our pre-generated per-module include paths needs to be triggered explicitly. Change-Id: I57ec441d58cdf8186907ee6c36dce08daa206c49 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * Adapt QtPrintSupport related uic ruleshjk2013-06-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | It's no more on QtWidgets. Task-number: QTBUG-31508 Change-Id: Iba117a4103c2b32173816a4ecb5faa187f169b32 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * eglfs: Fix bug determining physical screen sizeAndy Nichols2013-06-031-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the situation that the screenSize EGLFS hook had been defined, but not the physicalScreenSize, the uninitialized contents of fb_var_screeninfo vinfo would be used to calculate the fall-back physical screen size. Since this value is undefined, devices like the Raspberry Pi would end unable to render DPI dependent fonts. Change-Id: Ic9f67c1c646cc7b328b695b76a84d78577fefcd8 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| | * eglfs: prevent expose/geometrychange loopAndy Nichols2013-06-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents EGLFS from getting stuck after exposing the first frame, by constantly generating new Expose and GeometryChange events which are synchronously processed. Change-Id: Id3b09821ea31e9c1ddab7c520e782a4e42844a08 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| | * Update LICENSE.PREVIEW.COMMERCIAL licenseSergio Ahumada2013-06-031-2/+2
| | | | | | | | | | | | | | | Change-Id: I87b9c77327e2e32db77efb027172ccd21659e032 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| | * Only process vcproj files if we do a -fully-processOswald Buddenhagen2013-06-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A top-level vcproj (really a .sln file) only makes sense when sub- projects are generated too, since the solutions generator will ignore all non-generated projects. Originally-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Change-Id: Iff09279d5760b5114a4cfb9b58ad677f2f69fa58 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * run syncqt only for builds from gitOswald Buddenhagen2013-06-037-16/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the logic in the configures was even trying to express that, only that nowadays we always ship syncqt, so the tests were kinda pointless. this frees us from the perl dependency for non-developer builds of packaged modules (except for webkit, which needs almost every scripting language on earth anyway). obviously, this requires that the packaging scripts run syncqt in the source dir before tarring up the sources. note that for repositories other than qtbase, the -version argument needs to be passed to syncqt. Task-number: QTBUG-29465 Change-Id: Ic929ab17a5de4b30fbf48b3aa9bfa3b4d2ef37d6 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * move module master header generation back to syncqtOswald Buddenhagen2013-06-032-25/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | now that we split out the part that depends on the project file, we can do it cleanly here. this way we can generate these headers at pre-build time already. and for git builds, perl is probably faster than qmake at this task. Change-Id: I343255c6de22329471a3ae2c2aac9ebeb160a501 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * split out dependencies from module master headerOswald Buddenhagen2013-06-031-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | this will allow us the create the dependency list in a different way than the rest of the master header. Change-Id: Ib083fbbf6194cd9a161d669f860aaf32fd96d9d4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * remove pointless quoting of MODULE_*INCLUDES assignmentsOswald Buddenhagen2013-06-031-3/+3
| | | | | | | | | | | | | | | | | | | | | it would only cause trouble further down the line. Change-Id: Ied9ba8a1ecf36b77e1091c73564bd7601ea6a6b4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * let configure create the forwarding qconfig.h againOswald Buddenhagen2013-06-035-10/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this avoids that syncqt needs to forward to a yet unexisting file (which will have a yet unknown location, when syncqt is run at packaging time already). the %inject_headers syncqt config variable remains, so it can be told not to purge "foreign" files. Change-Id: I127ff6e0b7d5702fb0acaee9a5b7940b482d3608 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * move module version header generation back to syncqtOswald Buddenhagen2013-06-032-29/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there is no particular reason for it being done by qmake. avoids that the logic is distributed over two source files, and allows us to generate these headers at pre-build time already, including not forwarding to a yet unexisting file (which would have a yet unknown location). Change-Id: I9c78ab425cf6f01d076c86fd1ee602626f231487 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * factor out writeFile() functionOswald Buddenhagen2013-06-031-17/+27
| | | | | | | | | | | | | | | Change-Id: I8e3e1665d7628c3210d000c46dfffa9f1af71009 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * docs: DirView example uses QFileSystemModel not QDirModelShawn Rutledge2013-05-311-1/+1
| | | | | | | | | | | | | | | Change-Id: Ie172b1458401c4627314ff0db6992647388bf382 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * qdoc: excludedirs works againMartin Smith2013-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was comparing an absolute path to a relative path. These could never be the same. Instead of the relative path, it now gets the canonical absolute path, so the comparison succeeds when it should. Task-number: QTBUG-31404 Change-Id: I9c482d4649d493ce6d4f9a522cb61f2c8a5eb21f Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Android: Fix Windows build with recent SDKEskil Abrahamsen Blomfeldt2013-05-311-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the dx tool has moved in the SDK, we need to update our copy of it to also search in the new location for dx.jar. Task-number: QTBUG-31405 Change-Id: If093a9f51f33c5d8666919f516a3b336322a7169 Reviewed-by: Ray Donnelly <mingw.android@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| | * Fix typo in QSettings docs.Mitch Curtis2013-05-311-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I96dc2d57f5cc52c162ba0fd38d20141683847423 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Fix tst_qcombobox::itemListPosition.Friedemann Kleint2013-06-051-4/+6
|/ / | | | | | | | | | | | | | | Add font combo to top level via layout and position top level instead of the (child) font combo. Change-Id: I0f754c37c009d1ed83615b800d6f2467e858c047 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Prevent touch coordinates outside target geometryMikko Harju2013-06-051-3/+4
| | | | | | | | | | | | | | | | | | | | Previously, normalized positions with either of coordinates equal to 1.0 would be reported outside the screen / window geometry, which would cause hit test to fail. Change-Id: Ia5e083bd52254c7e05143eedf930be3bcba7a412 Initial-patch-by: Aaron Kennedy <aaron.kennedy@jolla.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | Fixed raw coordinate reporting for touch eventsMikko Harju2013-06-051-0/+2
| | | | | | | | | | | | | | The raw coordinates were not reported by the evdevtouch plugin. Change-Id: Ia06129edd771b12cc9f6a97dc678b545d226af70 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | Fix typo in QAlgorithms documentation.Mitch Curtis2013-06-051-1/+1
| | | | | | | | | | Change-Id: Ic9107f427acc1e009779d39e0a204ea81d54aee7 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Fix FBO restoring in QOpenGLTextureGlyphCacheValery Volgutov2013-06-051-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QOpenGLTextureGlyphCache::restoreTextureData restores FBO which was binded before restoreTextureData call. More specifically, it restores QOpenGLContextPrivate's current_fbo member. This works if FBO was binded by QOpenGLFramebufferObject but not if FBO was binded using glBindFramebufferObject and rendering done via QOpenGLPaintDevice. This patch fixes it by querying current FBO using GL_FRAMEBUFFER_BINDING query and restoring it. Change-Id: Ia97a21e62566dc39a5191b66d3ca0e3ad0845ce1 Reviewed-by: Valery Volgutov <valery.volgutov@lge.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Prevent negative size in QBitArray, QVector and QVarLengthArray ctors.Mitch Curtis2013-06-053-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As shown in QTBUG-24345, QBitArray will exhibit invalid reads when initialised with a negative size and run under valgrind. QVector and QVarLengthArray both cause a crash if initialised with a negative size. This patch enforces sizes greater than or equal to 0 with asserts and existing if statements, and hence impose no performance penalty for release builds. Task-number: QTBUG-24345 Task-number: QTBUG-30037 Change-Id: I9a969f6016e0a59904a60bbfe9e5360e6f523b87 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Changed project dependencies for solution filesAndrew Patterson2013-06-051-17/+27
| | | | | | | | | | | | | | | | | | | | Reorganized project dependency output in solution files for vc 2005+ Task-number: QTBUG-30993 Change-Id: I4764f3d98be40b3e217130522bb89a43bbf3669e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Use the GCC inline assembly when building for MinGWThiago Macieira2013-06-041-5/+5
| | | | | | | | | | | | | | | | | | | | | | MinGW has a longstanding problem of providing the MSVC intrinsics that every Windows developer expects to be there. Other projects have run into those problems. So instead just use the GCC inline assembly. Change-Id: I5651f97f9a4dfbf98ebbf063f91f221eab80b224 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Fixes QKeyEvent::count() on Windowsaavit2013-06-041-7/+7
| | | | | | | | | | | | | | | | | | | | | | All other main platform plugins leave the count parameter at its default value (1). For improved compatibility, make the Windows plugin do the same, instead of hardcoding the value to 0. Task-number: QTBUG-31285 Change-Id: Id87fd559d13f42391be3200d5ff2393285f0d2a6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
* | QDnsLookup: test multiple TXT answers tooThiago Macieira2013-06-041-48/+54
| | | | | | | | | | | | | | | | | | | | | | | | The TXT record is particular because each RR can contain multiple text strings. So we need to join each RR's texts too. To make it easy, I've made everything be QStrings. Change-Id: Ia0506544b913585e7be860c81077cff8e0dab547 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QDnsLookup: test MX and SRV records that can change orderThiago Macieira2013-06-041-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DNS protocol changes the order of the RRs in each reply it sends, in an effort to balance the load in servers. For most tests, to ensure that we get always the same result, we simply sort it back. For MX and SRV, we can't sort because we also need to test that QDnsLookup sorted correctly according to priority. So instead allow that test to have multiple alternatives. Change-Id: I5c119f907b31789de5c9cf2471cc82ecd140d06f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Mention QRect's int min/max constraints in detailed description.Mitch Curtis2013-06-041-0/+6
| | | | | | | | | | | | | | Task-number: QTBUG-25732 Change-Id: If330768c3075568f09593ed17f26389d3dec3335 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Make qtbase compile with QT_NO_TEMPORARYFILETasuku Suzuki2013-06-0413-8/+79
| | | | | | | | | | | | | | | | Change-Id: Ida2f59bb245ef70bf65f7e8944c4c315d5bc2f81 Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Fix broken build when using OpenSSL 0.9.8Scott Deboy2013-06-040-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | Resolving compilation issues encountered when dynamically linking to OpenSSL release 0.9.8 (no letter) Adding #ifdefs to address OpenSSL version issues, correcting q_sk_push declaration Conflicting code in qsslsocket_openssl.cpp not present in stable branch. Task-number: QTBUG-30615 Change-Id: I4b86ca4303343cca5d440ab9821b275028cc5a72 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* | Fix typoFrederik Gladhorn2013-06-031-1/+1
| | | | | | | | | | Change-Id: I0983f12759fdb806e4fc89f4abefb9088502208d Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2013-06-0338-143/+121
|\ \ | | | | | | | | | refs/staging/stable
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-05-3138-143/+121
| |\| | | | | | | | | | Change-Id: I0a8fe79a80b7720f76e3c0b03cc2c9a769d4009b
| | * Use [NSEvent characters] to retrieve the input character.Gatis Paeglis2013-05-301-14/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is how it was done in Qt 4. An issue with the current approach was that it did not consider modifiers when setting a Qt::Key_* value, which would assign the same Qt keycode for: a = a(65) Alt + a = ā(65) [here it should return a unicode value for 'ā'] This is inconsistent with the other platform plugins. Also in the combination with a dead keys it was returning nothing in the output. Task-number: QTBUG-29005 (cherry picked from commit 6730413fcac1d7eb39af3683b87f965c5823cb6c) Change-Id: Ic28eb55b3a9798ecb6012cc2e3fb18589b8b0392 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| | * Mac style: Remove yet another reference to widgetsGabriel de Dietrich2013-05-301-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: I545cfe22c6307864cdb18093a37e09a8ad042347 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * Fix tst_qtendian autotest build for WEC7.Janne Anttila2013-05-301-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSVC2008 compiler fo ARM targets fail to compile qToUnaligned when using sizeof(T) inside memcpy fynction. The compiler fails at least when the code is reached through the following macros and templates: -> tst_QtEndian::toLittleEndian -> qToLittleEndian(T src, uchar *dest) -> qToUnaligned(const T src, uchar *dest) The above sequence produces internal compiler error with MSVC2008/ARM builds when called from tst_endian. As a workaround sizeof(T) is called outside memcpy function. Change-Id: Ib4d382c2cebecb6e54bb99fc8fad72db93825fcd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * Windows: Suppress mouse events synthesized by OS.Friedemann Kleint2013-05-302-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the hint for QPlatformIntegration::SynthesizeMouseFromTouchEvents to false for Windows and suppress the events synthesized by OS. The synthesized events cause touch events to generate 2 clicks in Quick2. Leave code as is for Windows CE. Task-number: QTBUG-31386 Change-Id: Ia0987342dcdd55c8540810da5e4b90518a501ce6 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| | * Move QBasicDrag and QSimpleDrag to QtGui.Samuel Rødal2013-05-3012-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are useful as default implementations of QPlatformIntegration::drag(), instead of having it return 0 which will lead to crashes in Qt Quick 2 and widgets applications that use drag and drop. Task-number: QTBUG-31288 Change-Id: I70efa139306ced5d879def0f74e3a72d3bcd64f7 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
| | * fix PlatformToolSet tag location in vcxproj filesJoerg Bornemann2013-05-301-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PlatformToolSet tag belongs into the PropertyGroup with the label "Configuration". The former location in an anonymous PropertyGroup tricked Visual Studio into displaying the right PlatformToolSet but using its default value. If VS 2010 and VS 2012 are freshly installed on the same machine, the default toolset for VS 2012 is VS 2010. Task-number: QTBUG-30822 Change-Id: If00a532e92b0812c552b1cac52ff77a1e7039146 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * Disable precision timers when running MSVC2012 code on pre-Windows 8.Friedemann Kleint2013-05-301-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Precision timers can cause the event loop to lock up when running MSVC2012 code on pre-Windows 8. Task-number: QTBUG-27266 Change-Id: Idd73731e82843d0d140859bab825bc1a54eccf1a Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| | * qdoc: Handle collision nodes when building index filesTopi Reinio2013-05-302-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently qdoc skips collision nodes (and their children) when reading index files. This means that cross-linking between modules does not work for nodes that are defined under a collision page node. Most notably, the QML global object 'Qt' cannot be linked to from outside Qml module as it collides with Qt namespace. This change fixes the issue by skipping collision nodes and only processing their children when writing index files. In addition, we need to adjust the function that searches for nodes to the possibility that there may be multiple nodes with the same name but different type. Task-number: QTBUG-31096 Change-Id: Ic71d714f85539d8537021c73d8f1a527006a6f23 Reviewed-by: Martin Smith <martin.smith@digia.com>
| | * remove bizarre perl detection magicOswald Buddenhagen2013-05-301-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the code makes no sense, and was added with the QNX port without comment. there is already a detection a few lines up. Change-Id: I18ec18604c37c7c42f2649a658dd22324d481dd3 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| | * QMenu: Remove last references to QMacWindowFaderGabriel de Dietrich2013-05-304-44/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | It was never ported to Qt 5, and 10.7 has simple API for that. Task-number: QTBUG-31336 Change-Id: Ie00c4ed3af9cd098c9e63eba1c654f1801aa83aa Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| | * Cocoa: Allow delayed title setting in menu itemsGabriel de Dietrich2013-05-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is what happens in uic generated code. Therefore, we should not mark an item as text-synced until it's got its text set. Task-number: QTBUG-31378 Change-Id: I7bb7db8abad922b50546c7669d285369ebf01394 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| | * Cocoa: Hide empty menus from the menubarGabriel de Dietrich2013-05-301-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-31378 Change-Id: I33ab2979a26166fb07e836c85dfc8089af5e1fda Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>