summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QTextCodec: Fix source code indentationKai Koehne2014-10-291-1/+1
| | | | | Change-Id: Ia9a79e659e028eb6173a7adef12d4973f78c32e9 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* fontconfig: do not assume the path to a font file is Latin1-encodedShawn Rutledge2014-10-291-1/+1
| | | | | | | Task-number: QTBUG-42249 Change-Id: Ie5d41ed26a69103991a5189c4f42aa37ac73de26 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Cocoa: Handle Qt::WA_MacAlwaysShowToolWindowShawn Rutledge2014-10-292-1/+7
| | | | | | | | | | | Forward the flag to QWindow by setting the _q_macAlwaysShowToolWindowproperty on the window in QWidgetPrivate::create_sys(). Test for the property when creating the window. Task-number: QTBUG-29816 Done-with: Morten Sørvig Change-Id: Id810dda98d02deb0902192cce1783d8b16b04d04 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Cocoa: Fix regression in key handlingLiang Qi2014-10-291-1/+1
| | | | | | | | The text should be empty when Cmd key is in modifiers. Task-number: QTBUG-36281 Change-Id: Ic71e532695ad4a947c86e8d21ae864d70f9afa4c Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* xcb: Fix getting the primary screen from QXcbConnection::screens()Alexander Volkov2014-10-298-20/+26
| | | | | | | | | | | | | | | | Currently getting QXcbScreen* for primary screen is too messy and it wrongly uses QXcbConnection::primaryScreen() as an index in QXcbConnection::screens() although QXcbConnection::screens() returns the primary screen as the first item in the list since 3c8eb404877df9c967d81fa9df7d718c538fb407. So to clear the API rename primaryScreen() to primaryScreenNumber(), add QXcbConnection::primaryScreen() that returns correct QXcbScreen* and use it directly. Change-Id: Icb7391aa3e82b32ca48f2bda764dcf7ffd89cc47 Reviewed-by: Uli Schlachter <psychon@znc.in> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Cocoa: Send obscure events on OcclusionStateHiddenMorten Johan Sørvig2014-10-291-5/+10
| | | | | | | | | | | | | This disables animations for windows that are completely obscured by other windows. On examples/quick/animation, obscured CPU usage goes from 10% to 1%. There has been reports of 100% CPU usage with Qt before this patch. Change-Id: Iefea43ed8c1cfaa2df13f1f5a4e4450146ade522 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* Add qobject_cast template specialisation for QWindowJørgen Lind2014-10-291-0/+13
| | | | | | | greatly improving the performance of qobject_cast<QWindow *> Change-Id: If5a1afa6e41f4676f4838ea3ff80f1d89e396dfc Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4Oswald Buddenhagen2014-10-299-14/+24
|\
| * Merge remote-tracking branch 'origin/5.3' into 5.4Oswald Buddenhagen2014-10-289-14/+24
| |\ | | | | | | | | | Change-Id: I224e44a9df314b9a99d33148b6cf400fcbc9de8e
| | * Doc: Don't show a description for omitted SH_ComboBox_UseNativePopup enum itemAlexander Volkov2014-10-282-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | \omitvalue does not allow a description of an enum item, so move the description as a comment to the enum declaration. Change-Id: I4192b16e41b704cbad66c0eeafcb141087d2ba65 Reviewed-by: Martin Smith <martin.smith@digia.com>
| | * OS X: Fix broken 2x menu icon when style sheet is appliedMihailNaydenov2014-10-281-2/+2
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-41623 Change-Id: I4e0640a7739d0ce4f8758dd5d8d17882a6947467 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| | * fix namespaced DirectWrite buildJoerg Bornemann2014-10-282-9/+9
| | | | | | | | | | | | | | | Change-Id: Iec6d6ca121b2b04fc1eb4a97f1387ee630e6e1f5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * Add missing newline in fallback debug output.Volker Krause2014-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is hit in case of a recursion in the message handler, and message hasn't gone through qMessageFormatString at this point and thus lacks the newline. Change-Id: Ia098b6ccbcc1aff22a4695865f39143ba0152d9c Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | * Compile fix for QT_NO_IM in QtWidgetsSteffen Imhof2014-10-283-1/+10
| | | | | | | | | | | | | | | | | | | | | Added some #ifdef guards around usages of composeMode(). Change-Id: If2f2d3cae21b270933b38ea67dcc885f5871785f Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| | * Move animation-related header out of QT_NO_IM #ifndef.Steffen Imhof2014-10-281-1/+1
| | | | | | | | | | | | | | | Change-Id: I7f0bfed4ff9a608575cf6795016b2fa134fd273f Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | | Fix X86 Wince builds.Bjoern Breitmeyer2014-10-292-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Windows CE does not have all _BitScanReverse intrinsics, so disable those for Q_OS_WINCE. Change-Id: I34a3c02c6ffdfff2a209b2c9c1b80bef4566ee39 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | Fix QWidget::scroll during paintingAllan Sandfeld Jensen2014-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling scroll during painting fails in cases where the scroll is attempted accelerated. This is easily fixed by not using accelerated scrolling during painting. Task-number: QTBUG-41615 Change-Id: I38d2428d5679c242f13d53793a3dc3b8e01b538f Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* | | Properly detect UTF-8 BOM markers in ini filesLars Knoll2014-10-292-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | If we detect a utf8 BOM mark at the beginning of the .ini file, skip the marker and set the iniCodec to utf8. Task-number: QTBUG-23381 Change-Id: I1b37fc4f1638a48e4f3ee71ab165e2989bc592f1 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | | xcb: Fix setting the alert state for a windowAlexander Volkov2014-10-291-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send a _NET_WM_STATE client message to the root window instead of changing the window property. Task-number: QTBUG-41310 Change-Id: I864af0158ec55796bb3cbc123469709b2be54ec8 Reviewed-by: Martin Gräßlin <mgraesslin@kde.org> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | | Fix QLocalServer, create a temp path as small as possible.BogDan Vatra2014-10-281-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | If requestedServerName is a full path e.g. "/tmp/some/long/path" the temp path will end up "/tmp/some/long/path.balblabla/tmp/some/long/path" and it might fail because it doesn't fit in addr.sun_path. Change-Id: I6a138fd92be9e0b3b432ab9ac977d04cb330f3fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Fix justification in multi fontengine glyphrunsAllan Sandfeld Jensen2014-10-281-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTextLine::glyphRuns was not handling justification when splitting glyphRuns due to multiple font-engines. This patch adds the missing justification. Task-number: QTBUG-41901 Change-Id: I02d24218630506da21531a6499784dff2eecdf6f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | | QtBearer corewlan add list of remembered networksLorn Potter2014-10-281-5/+18
| | | | | | | | | | | | | | | | | | | | | These should be at least Defined by the system even with wifi power off Change-Id: I0964ba82fe3fab98585ea7771687cef4d1b70cf9 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | moc: do not error if the last token of a define is #Olivier Goffart2014-10-281-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not need to emit a diagnostic at definition time. The diagnostic will be emit at expansion time. Fix error when parsing boost header: /usr/include/boost/fusion/container/vector/vector.hpp:25: Error: '#' is not followed by a macro parameter Task-number: QTBUG-42233 Change-Id: I27deab362341f17ca3b0160615bb1b0934c3d5c3 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | | Remove redundant permission set.BogDan Vatra2014-10-281-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | The temp socket is in a safe place. There is no need to set any permissions at this point. Change-Id: I18ea4b71b7c20db65dc46c57ddc5d34d8b93f577 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Removed pointless conditional.BogDan Vatra2014-10-281-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Mode is always != 0 at this point (QLocalServer::WorldAccessOption is a combination of the bits tested later). Change-Id: I5abfb4e49fdc7903e21398525af05989f40d7f94 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: BogDan Vatra <bogdan@kde.org>
* | | Fix indentation & coding style.BogDan Vatra2014-10-281-18/+18
| | | | | | | | | | | | | | | Change-Id: Id974abca3ee2be9cb70c380a842e76c0ba1520bd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | iOS: Make a few member variables of QIOSTextInputResponder privateTor Arne Vestbø2014-10-281-4/+2
|/ / | | | | | | | | | | Change-Id: I269b1b5ab802c391a12bcdc8cfe0c4d3e52f9cba Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | direct2d: Fix window resize with translucent windowsAndrew Knight2014-10-281-5/+4
| | | | | | | | | | | | | | | | If the size of the window has changed, the backing bitmap should be reset with the new geometry. Change-Id: I1ca430cd7b5df1845b4fef31f5bf8f05d889a2fc Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
* | direct2d: Fix pixmap fills in composition emulation modeAndrew Knight2014-10-281-1/+2
| | | | | | | | | | | | | | | | When painting a pixmap with rasterFill, the brush should be offset to match the fill path. Change-Id: I4e361932643c4a98dce74e55ed16fae274bce43b Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
* | OS X - Cocoa backing store and drawRectTimur Pocheptsov2014-10-284-30/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | m_backingStore pointer has a limited 'lifetime' - usually it is set in -flushBackingStore:region:offset: method, then -drawRect: is invoked/forced by -setNeedsDisplayInRect:, after that it's dangerous to have a non-null pointer to a backing store (and we reset it). But if Cocoa invokes drawRect (due to some reason) our null backing store pointer is also not good. This patch instead is using a shared resource (QImage) from a backing store. This patch also makes getBackingStoreCGImage() redundant - -drawRect: was the only place we called it. Task-number: QTBUG-42206 Change-Id: Ie7726336f05d07c52f660f6326ae5cef114201dd Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | Doc: Fix method names for QFileSystemModelAlexander Volkov2014-10-281-1/+1
| | | | | | | | | | | | | | | | | | There are no methods called name() and path(), replace them by fileName() and filePath(). Task-number: QTBUG-41881 Change-Id: I001a8ead197327fac69e69d94230587ddb1a4692 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Doc: removed reference to obsolete classesNico Vertriest2014-10-281-6/+0
| | | | | | | | | | | | | | | | QSocket and QSocketDevice are not part of Qt 5.4 Task-number: QTBUG-40362 Change-Id: Ieffd992c203af94cac0eb21a630b6ac98754f358 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | iOS: Detect window deactivation without waiting for next runloop iterationTor Arne Vestbø2014-10-283-17/+58
| | | | | | | | | | | | | | | | | | Since we know and control whether or not we are making a new QUIView first responder, we can take not of this at that point, and use that information when another view is resigning first responder. Change-Id: I508720d418c92dc8a8011b489cc5cace8fc82633 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* | iOS: Add logging category for input method debuggingTor Arne Vestbø2014-10-282-0/+12
| | | | | | | | | | Change-Id: If1505b3b5f6ceb18fc8972192d637fc42530f993 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* | Hardcode UTF-8 for "unicode" in QTextCodec::codecForHtml().Friedemann Kleint2014-10-281-1/+4
| | | | | | | | | | | | | | | | | | | | ICU would return a utf-16 (endian dependent) codec for unicode which is very rarely what people want. In most cases, unicode is encoded in utf8 these days, so return a utf8 codec for it. Task-number: QTBUG-41998 Change-Id: I51ee758d520702b263a8b2011787eb1f3455ed96 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Check geometry correctly when replaying popup mouse events.Friedemann Kleint2014-10-281-8/+13
| | | | | | | | | | | | | | Task-number: QTBUG-41869 Task-number: QTBUG-39313 Change-Id: I2b59f5db6f0ae4007b1a3b58a79eed958e662272 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | iOS: update qtmn doc to use the actual function nameRichard Moe Gustavsen2014-10-271-3/+3
| | | | | | | | | | Change-Id: I62b656a317298ec40117017d74fca1be262a66b7 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | Cocoa QPA Plugin: Remove code depending depending on OS X 10.6 and olderGabriel de Dietrich2014-10-278-423/+187
| | | | | | | | | | | | | | Snow Leopard is unsupported from 5.4.0. Change-Id: I5c269cbdc93000a4657b63559cc3c526e298e3db Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | QMacStyle: Remove code depending depending on OS X 10.6 and olderGabriel de Dietrich2014-10-272-121/+36
| | | | | | | | | | | | | | Snow Leopard is unsupported from 5.4.0. Change-Id: I0c49a8353d5dc38169ab9679a986c35ab2df8d2f Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | QMacStyle: Refactor painter offset into drawNSViewInRect()Gabriel de Dietrich2014-10-272-39/+40
| | | | | | | | | | Change-Id: I05067ee400f0b776b0f0418ee1c5fbd45126c29e Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | ANGLE: Delete the ShaderImpl on gl::Shader object destruction.Jocelyn Turcotte2014-10-271-0/+1
| | | | | | | | | | | | | | | | Cherry-picked from https://chromium-review.googlesource.com/224106 Task-number: QTBUG-41588 Change-Id: I27d75da76cec0b3341f549a3e6891c1c6d321358 Reviewed-by: Andrew Knight <andrew.knight@digia.com>
* | QGtkStyle: fix segfault after re-creating QAppJ-P Nurmi2014-10-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QGtkStylePrivate::setupGtkWidget() cannot use a local static variable for the container, but it must insert it to the GTK widget map together with all other GTK widgets. The container is destructed as a GtkWindow child in the Qt post routine QGtkStylePrivate::destroyWidgetMap(). Task-number: QTBUG-41145 Change-Id: If1fda372ed1227edc779fa4951cbd6fbf6038499 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Jens Bache-Wiig <jensbw@gmail.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Fix shortcut handling with non-latin layoutsGatis Paeglis2014-10-272-48/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shortcut handling with non-latin keyboard layouts were broken for checks like: QKeyEvent key = ...; key == QKeySequence::SelectAll In Qt4 this was handled transparently when getting keysym from XLookupString. When ctrl modifier was set, XLookupString performed "keysym transformation" to obtain a latin keysym. Still this did not solve the non-latin shortcut issues for all cases due to some of Xlib assumptions which could not be controled by user. This patch implements XLookupString-like behavior in lookupLatinKeysym(). It is not a 1-to-1 copy of how XLookupString perfoms latin keysym lookup, but it serves our needs just fine. lookupLatinKeysym() also handles the cases that did not work in Qt4 with XLookupString, thanks to libxkbcommon keymap query API. And lookupLatinKeysym() replaces the fragile implementation of "fallback latin key" code path in possibleKeys(). Done-with: Ruslan Nigmatullin Task-number: QTBUG-33182 Task-number: QTBUG-32274 Change-Id: I56a5b624487ca6c2c3768220301a37dac39b439a Reviewed-by: Ruslan Nigmatullin <euroelessar@yandex.ru> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Doc: link to MIBenumNico Vertriest2014-10-271-4/+4
| | | | | | | | | | | | Task-number: QTBUG- 40362 Change-Id: I0261117d8aef8383ef77887a201d61ed0bd0ba52 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Doc: Corrected identifiers for QByteArray::toBase64 in snippetNico Vertriest2014-10-271-4/+4
| | | | | | | | | | | | Task-number: QTBUG-40944 Change-Id: I31fc23739b3e145b3668b10fdf4465c19d2fdb01 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Doc: Corrected autolink errors qtbaseNico Vertriest2014-10-272-5/+5
| | | | | | | | | | | | Task-number: QTBUG-40362 Change-Id: I054a4713bdd83280be51697689e0c3c3409b9601 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | QSwipeGestureRecognizer: Prevent cancel in startup-phase.Friedemann Kleint2014-10-272-10/+23
| | | | | | | | | | | | | | | | | | | | Replace the boolean 'started' member by an enumeration which indicates the startup phase. While in that phase, do not cancel when pressed points are detected for fewer than 3 touch points. Task-number: QTBUG-15768 Change-Id: Ic57b19e3002392fb632f551f615d80ada9831d34 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Don't link to Xlib's Xrender libraryGatis Paeglis2014-10-271-1/+1
| | | | | | | | | | | | | | We don't use this library in XCB plugin. Change-Id: Ifcc2f404b3cbf5601eb094eaac923d2f9e6e981b Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Rotate images according to Exif orientationRainer Keller2014-10-271-1/+149
| | | | | | | | | | | | Task-number: QTBUG-37946 Change-Id: I181f88acdff0ef76aa02e968dc6afca1ed495f38 Reviewed-by: aavit <eirik.aavitsland@digia.com>
* | Send screen change events before expose events.Morten Johan Sørvig2014-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | This fixes the "expose event received for window with invalid geometry" warning from Qt Quick. The window's current screen is now up to date when processing the expose event. Change-Id: Ia5c83e34154182699ec587835f9063809d819d7d Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 05:22:35 +0000