summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix error when inserting to tables with datetime fields with QODBCThiago A. Correa2012-10-081-4/+42
| | | | | | | | | | | | | | SQL Server 10 introduced stricter rules for TIMESTAMP validation, making it necessary to specify the decimal digits. Other databases might do the same as well, so this patch introduces a check for the TIMESTAMP column size and adjusts the decimal digits parameter as needed. Task-number: QTBUG-2192 Change-Id: If6d798c6c928ebda75bc474e49a07fbbfbe5816c Reviewed-by: Mark Brand <mabrand@mabrand.nl> (cherry picked from qtbase/b8b79a0f37ec74fd5b4ad829e522a384ba3622ae)
* Register Qt 4.7 import on-demand, instead of at startup.Robin Burchell2012-10-049-19/+58
| | | | | | | | | | | | | | | | | | This is a slightly less awkward approach (keeps backwards-compatibility) while speeding up startup for applications that don't use the old import path. Also prints a warning to let developers know they should migrate their code when possible. Completely disabling the Qt 4.7 import is still possible by setting QT_NO_IMPORT_QT47_QML. This takes around 10-15ms off a very simple "hello world" on my macbook. (backport of qtquick1/2a3e9eb0ba00acf30b9cc40f7e2e4347726fb6b4) Change-Id: I6960e7c28bb4f153d793802b978c1944977e8ed4 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fixed text drawing in OpenGL 2 paint engine.Samuel Rødal2012-10-031-2/+1
| | | | | | | | | | Regression introduced in 0aa9b30432cec3b7. Partial backport of 12590582a2f676912690 in Qt 5. Task-number: QTBUG-24453 Change-Id: I9522cff661849981096d4efe70164841739ff359 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Update the state of native menus correctly on MacPasi Matilainen2012-10-023-12/+7
| | | | | | | | | | | | | | | | | | | | | The state of native menus is currently updated in two incompatible ways on Mac, either by updating the state of native menu items in a native menu (when setEnabled is called) or the state of the native menu item containing the native menu (when the menus are initialized and when a modal dialog is opened/closed). This causes various problems, e.g. inability to enable a menu that was disabled before menu initialization or menus getting enabled incorrectly after a modal dialog is closed. Fix by always setting the state of the native menu item that contains the native menu. Also, autoenable is active for the main menu, resulting in unnecessary menu validation calls, so turn it off. Task-number: QTBUG-25544 Task-number: QTBUG-26399 Task-number: QTBUG-7538 Change-Id: Iab335af633604e7b3017eaa55464d1b8fdd7b821 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* QNX: Only set parent window if it is not NULLRafael Roquetto2012-10-021-1/+1
| | | | | | | | | | | | | | | 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>
* QNX: Fix bug on window hierarchy listThomas McGuire2012-10-021-8/+6
| | | | | | | | | | | | 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>
* Blackberry: Support input method hintsThomas McGuire2012-10-023-4/+23
| | | | | | | | This is a backport of qtbase commit d162f276714f04b07827dfd525deea45dc55a5f1 Change-Id: I3ae3994d305eebd61773e175332cecfa1d9cde51 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Blackberry: Fix hardware button detection on the BB Dev AlphaThomas McGuire2012-10-021-1/+1
| | | | | | | | | | | 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>
* EngineDebug: Updated and renamed serviceAurindam Jana2012-10-024-72/+96
| | | | | | | | | | | Updated service to include parent ids. Since this will break client compatibility, the service has been renamed to 'DeclarativeDebugger' from 'QDeclarativeEngine'. This is effectively a backport of the 'QmlDebugger' service from Qt5. Change-Id: Ic3000712d986e19bdf89417e9c4c23229d56f9dc Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix issue with mispositioned family name i QFontComboBoxEskil Abrahamsen Blomfeldt2012-10-011-1/+12
| | | | | | | | | | | | | | | | | | | Mac OS X 10.7 comes with the family of Stix fonts, some of which exposed an ugly layout bug in the QFontComboBox because the ascent/descent ratio is very large due to a very high ascent, so centering the text vertically might cause most of the text to be clipped away. The solution is to detect when the ascent is larger than the height of the destination rectangle (hence a large part of the characters will be clipped) and use the actual bounding rect for centralizing instead. Since this only happens for a very few of the fonts, the overhead of getting the bounding rect should be tolerable. Task-number: QTBUG-26691 Change-Id: I4f1a9b3c63138fde4dfdfa99d8581458c59b7ff6 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* QNX: use assert on QBBWindow destructorRafael Roquetto2012-09-301-5/+3
| | | | | | | | | | | 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>
* Fix g++/MinGW compiler warnings.Friedemann Kleint2012-09-2933-72/+36
| | | | | | | | | | - 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 from Nokia to DigiaIikka Eklund2012-09-294437-104131/+104322
| | | | | | | | 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>
* clear XSizeHints before useDavid Fries2012-09-282-1/+3
| | | | | | | | | | | | Always clear the XSizeHints before retrieving with XGetWMNormalHints because if the window doesn't have size hints set the structure will remain uninitalized. Clear XSizeHints in other locations as well just to be safe. Task-number: QTBUG-15418 Change-Id: Ia9a0c485389bf27016ee7f206a3a916d0bbcbcfa Signed-off-by: David Fries <David@Fries.net> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* [QTBUG-27308][QTBUG-21534] Don't mouse-wheel-scroll QScrollBar when disabledMarc Mutz2012-09-271-0/+2
| | | | | | | | | | | | | | | | The Qt 5 fix (aec5b76) doesn't apply here, because it introduces a new symbol that might break forward compatibility if code compiled against a newer Qt 4.8 is run against an older Qt 4.8, and QScrollBar::wheelEvent() ends up being devirtualised. So copy the guard clause from QWidget::event() here. Task-number: QTBUG-27308 Reported-by: chenjiexin Task-number: QTBUG-21534 Reported-by: Martin Koller Change-Id: I5d2f823c65bae8cff33bac320c37e6496b14646c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fixed outline / fill inconsistencies in raster paint engine.Samuel Rødal2012-09-273-20/+2
| | | | | | | | | | | | We did coordinate rounding of the fill in the raster paint engine to match how drawLine_midpoint_i rendered lines. With the new cosmetic stroker in 4.8 this rounding is not needed anymore. Task-number: QTBUG-26013 (cherry picked from commit b6acec1e5d55d03ad3a0a70d2cf371d3f8fde629) Change-Id: I0324e3a45c525890fb58817a180c6aa712716780 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Load Mac specific resources in a static buildAndy Shaw2012-09-271-1/+4
| | | | | | | | | When Qt was built statically then the Mac specific resources were not being loaded which meant some style specific images were not used. Task-number: QTBUG-25391 Change-Id: Iad538b5f1935ed1744617d6e47ae3e68aa36afac Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Avoid crash caused by drag and drop and winId()Jian Liang2012-09-271-9/+19
| | | | | | | | | | | | | | | Task-number: QTBUG-27263 QWExtra object pointer is not guaranteed to be valid in QWidget::unregisterOldDnd() since commit f6bf4b2baa91e55f40596bf3f2823b119fdfa5e0. To avoid crash we have to check QWExtra object pointer of the native parent widget before access it, and if the pointer is not valid we should check its native parent widget recursively. Change-Id: I764fea4a0826cff751dd74a0fb67e0d2971c1d49 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* cleanup CUPS tmp filesTeemu Katajisto2012-09-271-0/+1
| | | | | | | | | | | | | Set fd in openPrintDevice() so that it gets cleaned up properly in closePrintDevice(). Backported from the Qt5 commit: 99bab571b4cb41362e891f1bb1e812119701c932 Task-number: QTBUG-14724 Change-Id: I02968d597822b636078ae89566dd8ed8a948019b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Include the signal code in the argument of (dis)connectNotify().Thomas McGuire2012-09-265-14/+18
| | | | | | | | | | | | | | | | As it turns out, the convention of (dis)connectNotify() is to include the signal prefix, i.e. '2'. Therefore add this prefix also when calling these functions from QML. Also add a unit test confirming that the C++ and QML cases are now handled the same way. This patch is not needed in Qt5, as connectNotify() and disconnectNotify() take a QMetaMethod as a parameter, not a const char*. Change-Id: I3add0fc13c60a479949cf3d31218af5fd3f546a2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QElapsedTimer: Fix typo in restart() documentationJonathan Liu2012-09-261-1/+1
| | | | | | | Change-Id: Iac5df9edbe16ec841f783bc5266091a6e34e9cab (cherry picked from commit 4efd73bc3ac318ec40adea2f21b3c9359ea1795a) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Revert "Delete JS-owned QML objects right away in the engine dtor."Peter Kümmel2012-09-258-57/+23
| | | | | | | | | | | This reverts commit ecc432a5b7ae269220f86c6f0b3dd364f8643191 to fix a crash on exit. Task-number: QTBUG-20377 Change-Id: I6606ff194f2c16e06bdbbfca94e55821cf055f75 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* HTTP header may be damaged - fix, unit testTomasz Duda2012-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | "HTTP/1.1 100 CONTINUE\r\n" If the header from a server is splitted between two packets the first packet contains "HTTP/1.1 100" and the second one contains " CONTINUE\r\n", one space (0x20) is skipped. After processing the line looks in this way "HTTP/1.1 100CONTINUE". QHttpNetworkReplyPrivate::readStatus(QAbstractSocket *socket) is called twice, if a http header is splitted as above. The function always removes whitespace from the beginning of a packet, even if it is the second part of a http header QHttpNetworkReply returns QNetworkReply::RemoteHostClosedError due to damaged http header during processing. Task-number: QTBUG-27161 Backported qtbase/60f4fc8b706db9cbeacd5dc4886a7aa347daafc0 Change-Id: I07ec43641bbb9966285a8a1f57a51fb27d2643d4 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fixed inconsistent rounding of square cap pens.Samuel Rødal2012-09-251-10/+10
| | | | | | | | | | | | | A horizontal line should round up at the same time as a vertical line with square cap, when rendering at subpixel coordinates. Thus, the special casing in the cosmetic stroker of offsetting by half a pixel should be for flat caps instead of for square caps. Task-number: QTBUG-26013 (cherry picked from commit 72aaba336c7afe6d79d59995bfb31a8effca4e9e) Change-Id: If7e7c6b6e37c5b1ce4685012a11fd29ff0b1df5a Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QNX: don't show the virtual keyboard when focusing an item view.Nicolas Arnaud-Cormos2012-09-251-1/+5
| | | | | | | | | 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>
* float->int error in OS X Mouse Event HandlingGerhard Roethlin2012-09-241-1/+3
| | | | | | | | | | NSEvent for mouse events contain the mouse position in floating point numbers. This value is truncated/floored for mouse clicks. Qt instead rounds that value, so mouse move events can get positions that are slightly off sometimes. This solves #QTBUG-27273. Change-Id: I2d3f59a09f50cb83dc1ccf6de940b7d99087c9ee Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Rotate non maximized windowsRafael Roquetto2012-09-212-0/+109
| | | | | | | | | | | | | | | | | 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>
* Fixed potential use of uninitialized variable in qgl.cppSamuel Rødal2012-09-211-1/+1
| | | | | | | | | If glGetBooleanv fails this variable is left uninitialized. Task-number: QTBUG-26952 Change-Id: Idb42833f2907bb66fd87c5cdb39753fca04e7438 (cherry picked from commit 0d55b4596f490f8f64eb3134e77e59df7d1c16f9) Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix build for platforms that use QPA other than IOSPeter Hartmann2012-09-192-2/+2
| | | | | | | | | | | For instance on Blackberry this would try to include Mac libraries as well. In Qt 5 this is still working. Change-Id: Iae9d3b7e1b988ac8932c58deabfeb249cd2cfc2e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Disable SSL compression by default.Richard Moore2012-09-193-4/+9
| | | | | | | | | | | Disable SSL compression by default since this appears to be the a likely cause of the currently hyped CRIME attack. This is a backport of 5ea896fbc63593f424a7dfbb11387599c0025c74 Change-Id: I6eeefb23c6b140a9633b28ed85879459c474348a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Peter Hartmann <phartmann@rim.com>
* Refactor coreservices -> ios & QT_NO_CORESERVICES -> Q_OS_IOSIan Dean2012-09-1818-40/+40
| | | | | | | Similar work was done in Qt5 in Change Id3b02316 Change-Id: I392d2a5bfffb9a335f28d5dbc5ea27b800fc4487 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* QNX: Enable support for hardware buttons in QPA pluginSean Harmer2012-09-175-4/+321
| | | | | | | Backport of 3f407cddf8b1d5fc09b414dbecd9a47d30e3abe7 Change-Id: Id7fd3ca76793d8d3e3698dd402fe31e04567e938 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* QNX: Add some optional debug output to event dispatcherSean Harmer2012-09-171-0/+19
| | | | | | | | Backport of 6998c4b2ad5fdf5f525bd77ec0fd3c6667b102b7 Change-Id: I32ceb7cc8e000c8fd00bf9e5ed6d6f8b796c73ad Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Fix crash when invalidating a QSortFilterProxyModelStephen Kelly2012-09-141-6/+22
| | | | | | | | Backport of d7a15fbfd93fb566c7793596ea50d8786b9eb654 from qtbase. Task-number: QTBUG-27122 Change-Id: I0b1eda292fd9648e6f08629f7a069b66bb8b59e8 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Delete JS-owned QML objects right away in the engine dtor.Thomas McGuire2012-09-148-23/+57
| | | | | | | | | | | This prevents memory leaks when the engine is destroyed after exec() has already finished. In most cases this happens during application shutdown, at which point the event loop is never entered again. Task-number: QTBUG-20377 Change-Id: I65564ed3e56314d656d92fd66f11ae67d4eb932b Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix MinGW-w64 compilationJonathan Liu2012-09-141-1/+1
| | | | | | | | | ENABLE_EXECUTABLE_ALLOCATOR_FIXED requires sys/mman.h which is not available with MinGW-w64. Change-Id: I6e76ce0c570e5819657debf813f0e80cef907dd4 (cherry picked from commit 02c37f59839b7bb36b231560893fa3bccbecc065) Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Fix regression in QTextDocument::toHtml() with font pixel sizeEskil Abrahamsen Blomfeldt2012-09-131-0/+1
| | | | | | | | | | | | | | Introduced by 2e0003eda4783f69a40fb4b31e7084c761d9640d. We were missing a attributesEmitted=true which caused the output from toHtml() to sometimes be invalid when using pixel sizes to specify the font size. This is a back-port of e640ebacb97f6eea9614925b1da3b97a0ff51409 from Qt 5. Task-number: QTBUG-25778 Change-Id: Ied61fcaef425a590d71c0b52292ac676cb88ba52 Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
* qpa: improve DirectFB performanceJulien Brianceau2012-09-131-0/+4
| | | | | | | | | | 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>
* QNX: Do not initially commit all memory used in RegisterFileThomas McGuire2012-09-132-4/+39
| | | | | | | | | | | | | | This reduces memory consumption of an application quite a bit. This is a backport of 3958828af8ee5cc046c664d8d8e483314eac06cb from qtjsbackend. At the same time, it is a backport of upstream commit http://trac.webkit.org/changeset/111234, although the patch is quite different as upstream and Qt's JSC have diverged a lot. Change-Id: Ia76359ae614ddd4aeda9c7c7b012e5809b50074d Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Fix realpath() call to older POSIX platformsRafael Roquetto2012-09-121-8/+13
| | | | | | | | | | | | | | Some POSIX platforms do not support realpath(X, 0). This commit is akin to the following qt5 commits: 4a4e9e4a9c56f9b27f2fb76fae6ff06b9f470895 ad5d64226abd50a43856ab560583f37b49ff04c9 6e8e1da0a8267d2f8f568403e6ab9fe53b01cd29 f3707a5a0c4483b15e7bb2ba9f0e7d1913a713ee Change-Id: I05dc12cedefcaaa11eec2bcc71df023fdb51ac00 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fixed crash in blackberry platform plugin shutdownBernd Weimer2012-09-121-3/+3
| | | | | | | | 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>
* qpa: extend drawPixmap capabilitiesJulien Brianceau2012-09-124-43/+105
| | | | | | | | | | 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>
* Ensure that QApplication is cleaned up after itself on MacAndy Shaw2012-09-123-0/+13
| | | | | | | | | | If the sendEvent function is replaced on the NSApplication, then QApplication should ensure that it undoes that if it is destroyed while the NSApplication is still running. Task-number: QTBUG-24248 Change-Id: I087ae575b7d670fa8dacfb80636d813c7bceb41d Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
* Ensure child items are updated even if the parent item has no contentAndy Shaw2012-09-121-1/+2
| | | | | | | | | | | | | When a parent item had its visiblity toggled, then the child item would not update if the parent item had ItemHasNoContents and ItemClipsChildrenToShape set. This is a common use case in declarative as the root item has ItemHasNoContents set. Task-number: QTBUG-26846 Change-Id: Id6592ebc4ba2caa4331a4a71f7247e40993131b6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> (cherry picked from commit 49c251e0543ea80e69d1725bb08bb4dfe3f225ab)
* qpa: add non-opaque fill supportJulien Brianceau2012-09-125-25/+120
| | | | | | | | | | | 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>
* Prevent a crash when a merged action is removedAndy Shaw2012-09-111-0/+10
| | | | | | | | | If a merged action is removed then a crash can occur if it is readded later. Task-number: QTBUG-24917 Change-Id: I43dcde3f40950fafc33d976e861a90fe1c38d061 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* QtNetwork: bypass proxy for local connectionsJulien Brianceau2012-09-072-10/+13
| | | | | | | | | | | According to Qt doc, "Network proxy is not used if the address used in connectToHost(), bind() or listen() is equivalent to QHostAddress::LocalHost or QHostAddress::LocalHostIPv6. This is not the case in current implementation. cherry-picked from qt5/qtbase commit 5b1bc864a91c3bdb02e36e7546dadebabb42fdec Change-Id: I20585b4be1149f67f77f02903aac53ee8b140eab Reviewed-by: Richard J. Moore <rich@kde.org>
* Fix calculation of logical child index for row headers.Tilman Sauerbeck2012-09-071-1/+1
| | | | | | Change-Id: I6b7a5b4d698d496a6710dd479b24f10c7d7e5851 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com> Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Symbian: fix symbian QtCore deffile (for QObjectPrivate)Pasi Pentikainen2012-09-071-0/+2
| | | | | | | | | | Freeze added exports caused by commit 3c4c9709 (change If5c3701426208875f3b775040c4e7bcbaac2b0a9), to fix Symbian winscw build break. Change-Id: Ia8c14d95004e17059af05e91431b71b6767d3885 Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Symbian: fix symbian QtCore deffiles (for QUrl::detach)Pasi Pentikainen2012-09-072-0/+3
| | | | | | | | | Freeze added exports caused by commit c3fe37fe (change Ie2674e46eb7416b0e753323b673c10f9d3457f6d). Change-Id: Icca8eff81e62f73639ee7f21b087370dfe501571 Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
generated by cgit v0.12 at 2024-09-22 07:42:25 (GMT)