summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Specify better increment for captured propertiesAlan Alpert2012-12-113-4/+4
| | | | | | | | There aren't that many captured properties, decreasing the increment will give better performance. Change-Id: Iddb17c695eda5513f2d038123f4c886e559d8f6b Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Fix binary incompatibility between openssl versionsShane Kearns2012-12-113-1/+13
| | | | | | | | | | | | | | | OpenSSL changed the layout of X509_STORE_CTX between 0.9 and 1.0 So we have to consider this struct as private implementation, and use the access functions instead. This bug would cause certificate verification problems if a different version of openssl is loaded at runtime to the headers Qt was compiled against. Task-number: QTBUG-28343 Change-Id: I47fc24336f7d9c80f08f9c8ba6debc51a5591258 Reviewed-by: Richard J. Moore <rich@kde.org> (cherry picked from commit eb2688c4c4f257d0a4d978ba4bf57d6347b15252)
* Fixes ignored composition mode in QPainter::fillRect with X11 engine.Samuel Rødal2012-12-111-2/+8
| | | | | | | | | It's not sufficient to check that the source brush has an alpha, there are composition modes that depend on the destination instead. Task-number: QTBUG-28499 Change-Id: I4b267544c607b6a68c4c52a6784d526bec604d75 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Fix SSSE3 support build failure on mingwErik van Pienbroek2012-12-111-1/+1
| | | | | | | | | | | | | | | | Commit 94253f3472a13ac4eab3ccfbbba9d14165647f85 made QMAKE_MAC_XARCH to be set to 'no' for MinGW environments. Due to this change building for MinGW environments where SSSE3 support is available got broken. While building the imageformats plugin qjpeg4 the following error occurs: undefined reference to `_imp___Z32qt_convert_rgb888_to_rgb32_ssse3PjPKhi' This commit makes building Qt on MinGW environments where SSSE3 support is available working again Change-Id: Ib2a4b3cc244af8bdde70d2d2240c70ff0e7a4cc2 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Daniel Molkentin <daniel@molkentin.de>
* Blackberry: remove JSON plugin reference from .proRafael Roquetto2012-12-101-2/+0
| | | | | | | | Remove a reference to blackberry.json from the Blackberry bearer engine plugin. This reference only makes sense under Qt5 Change-Id: I1592a17e38cb80b3fb138fc0538f3b4ea33739c8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix QWidget support on PlaybookRafael Roquetto2012-12-091-1/+29
| | | | | | | | | | | | The BPS version provided by the current version of the Playbook OS does not support orientation locking. This patch implements this manually. This patch is not needed in Qt5, since the API has changed. Change-Id: Ibba6fb3437cb392e3ba3d2b1997a178653226131 Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Bernd Weimer <bweimer@rim.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* [QTBUG-27420] Make Q{Box,Grid,Form}Layout::takeAt() unparent a nested layoutMarc Mutz2012-12-093-5/+23
| | | | | | | | | | | | | | QStackedLayout doesn't have support for QLayout, only QWidget, so the issue doesn't arise there. (cherry-picked from qtbase/716d33d2a73ade42eb31be3e8ecbaeecdd5ddd21) (only change: s/reset()/clear()/ in the tests) Reported-by: Johannes Schaub Task-number: QTBUG-27420 Change-Id: I7f3c4b1996e954428c00d4dda1095712efa91367 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Disable graphic effects for widgets on Mac to prevent crashingAndy Shaw2012-12-091-1/+4
| | | | | | | | | Since graphics effects on widgets are not supported on Mac then the code is #ifdef'd out so that it does not crash instead. Task-number: QTBUG-24792 Change-Id: I4d81675b54816fa60cf66696b1a0a7b0206474e3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Bump Qt version to 4.8.5Sergio Ahumada2012-12-073-4/+4
| | | | | Change-Id: I7e991d4b1f7f3b5a51170e6ff09e293c4285ea26 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix for fullscreen resolution change on QWSKarim Pinter2012-12-071-2/+6
| | | | | | | | | Fix for QTBUG-27607. Now it handles the setMaxWindowRect for fullscreen widgets. It is called when the resolution changes with QWS. Change-Id: I0fdbb39c55f727b6507fbb14369943dd8b7c2d7e Reviewed-by: Samuli Piippo <samuli.piippo@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* fix uninitialized has_brush,has_pen in QOpenGLPaintEnginePrivateDon Hatch2012-12-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix probably-benign uninitialized memory reads of QOpenGLPaintEnginePrivate's member has_brush (if first call to updatePen() is before first call to updateBrush()) or has_pen (if the opposite). This makes the following error reported by valgrind 3.7.0 disappear: % valgrind --track-origins=yes --leak-check=no demos/composition/composition (press the "Use OpenGL" button) ... ==30137== Conditional jump or move depends on uninitialised value(s) ==30137== at 0x4C72CBD: QOpenGLPaintEnginePrivate::updateUseEmulation() (qpaintengine_opengl.cpp:2135) ==30137== by 0x4C76F2A: QOpenGLPaintEngine::updatePen(QPen const&) (qpaintengine_opengl.cpp:2145) ==30137== by 0x4C7708D: QOpenGLPaintEngine::penChanged() (qpaintengine_opengl.cpp:5416) ==30137== by 0x4C7C960: QOpenGLPaintEngine::begin(QPaintDevice*) (qpaintengine_opengl.cpp:1421) ==30137== by 0x5376BE7: QPainter::begin(QPaintDevice*) (qpainter.cpp:1881) ==30137== by 0x41B06F: ArthurFrame::paintEvent(QPaintEvent*) (arthurwidgets.cpp:149) ==30137== by 0x5223315: QWidget::event(QEvent*) (qwidget.cpp:8532) ==30137== Uninitialised value was created by a heap allocation ==30137== at 0x4A082CF: operator new(unsigned long) (vg_replace_malloc.c:287) ==30137== by 0x4C7736C: QOpenGLPaintEngine::QOpenGLPaintEngine() (qpaintengine_opengl.cpp:1234) ==30137== by 0x4C5171C: QGLEngineThreadStorage<QOpenGLPaintEngine>::engine() (qgl_p.h:939) ==30137== by 0x4C48E32: qt_qgl_paint_engine() (qgl.cpp:5333) ==30137== by 0x4C48E4E: QGLWidget::paintEngine() const (qgl.cpp:5345) ==30137== by 0x5376351: QPainter::begin(QPaintDevice*) (qpainter.cpp:1785) ==30137== by 0x41B06F: ArthurFrame::paintEvent(QPaintEvent*) (arthurwidgets.cpp:149) ==30137== by 0x5223315: QWidget::event(QEvent*) (qwidget.cpp:8532) ==30137== ... These members don't appear at all in the qt5 source, so I'm assuming this isn't an issue there. Therefore I'm submitting this fix directly, and only, to the qt 4.8 source, rather than putting it in qt5 first. (I wasn't able to get the composition demo program to exercise the opengl drawing code at all on qt5, so I can't say for sure whether qt5 is free of similar issues at this point.) Change-Id: Ic69beddd6e2c50b827140cb8790b40b9336c8f4e Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Clear focus of GraphicsItem focus scopes and their children.Andrew den Exter2012-12-051-3/+9
| | | | | | | | | | | | | A focus scope has effective focus if one of its children is the focus item, clearFocus() should remove effective focus from an item and its children not just from the focus item. Task-number: QTBUG-28328 Reviewed-by: Martin Jones <martin.jones@jollamobile.com> (cherry picked from commit ab97a44b6ae5cc826460f3704669383afd398594) Change-Id: Ib6f43b40091cb1bb1a0d5b8b9ac71e44f35b037b Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* QNX: Move buffer count check to appropriate locationRafael Roquetto2012-12-031-13/+13
| | | | | | | | | | | | The buffer count check should take place right after buffers are created. For some reason, the buffer count value inside libscreen may become incosistent during the course of the program. cherry-picked from qt5/qtbase 1b95d3331cb43fda36f92189ddce4e4c45bd47ea Change-Id: Id542b3f8633ce118b0c125d47f3eda63ca31fe5e Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Qnx: Check if QCoreApplication::instance() exists before using QSocketNotifiermfekari2012-11-291-2/+5
| | | | | | | This is a back port from: 5e59215ac649190a5b86f9af283d0cf41b88b3bf Change-Id: I889f8b69a0c81a5e0ed71d28a65279fe6e238e2f Reviewed-by: Peter Hartmann <phartmann@rim.com>
* Remove invalid assert from QGraphicsSceneRafael Roquetto2012-11-281-1/+0
| | | | | | | | | | | | This assert has become invalid since commit 40fef403. After that commit, the 'origin' mentioned by the assert is not necessarily the first item of cachedItemsUnderMouse, since it origin can be reassigned at line 5839. cherry-picked from qt5 f4b80c1210e444ad7454abfb80ba166ce2e2a5f2 Change-Id: Iae264f5b301b4bf76b59c7262b06edb24c594ee5 Reviewed-by: Bernd Weimer <bweimer@rim.com> Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
* QML file loading: honor synchronous requests made through QNAMAlan Alpert2012-11-282-8/+28
| | | | | | | | | | | | | So that it can skip loading state when the underlying QNetworkReply is already finished. Parts-of-the-patch-by: Jeremy Nicholl Task-number: QTBUG-27723 backport of e5783b79887299d094e6976630373a4899bd7074 from qtquick1 Change-Id: I8f5ee61a754ddec81ec70f82eb39e727534a6049 Reviewed-by: Alan Alpert <aalpert@rim.com>
* QNX: fix QProcess fd inheritanceRafael Roquetto2012-11-281-3/+18
| | | | | | | | | | | Under QNX, QProcess was not inheriting the parent's file descriptors. This patch fills in the fd_map array, containing the file descriptors to be inherited, which is passed to spawn(), accordingly. cherry-picked from qt5 226f245c71df5673b5114615fbd9ad5c285b8d3a Change-Id: Id2957c6278bc21c89234a84b364763b601ae08a1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Prevent crashes after throwing an exception.Mitch Curtis2012-11-281-0/+15
| | | | | | | | | | | | | | | After bc3491c1b85ca36486c9472ecf7ba82f46699e8a, throwing an exception from a slot will cause the application to crash (segfault). This patch wraps the offending callFunction call in a try/catch block when QT_NO_EXCEPTIONS is defined, allowing the appropriate cleanup to occur and hence preventing the crash. Task-number: QTBUG-26825 Task-number: QTBUG-27548 Change-Id: Ia3a02398b0308b2216ad17f8f643745bd013fd50 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Fix conflict between QMainWindow::restoreState, QWidget::setStylesheet.Mitch Curtis2012-11-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | If QMainWindow::restoreState() then QWidget::setStylesheet() were called before the QMainWindow is shown, the size of QDockWidget can not be restored. QWidget::setStylesheet() will generate QEvent::StyleChange event, which will cause the function QDockAreaLayout::fitLayout() to be called before the layout of MainWindow is activated. Although the state info has been stored in a QMainWindowLayoutState variable by QMainWindow::restoreState(), but QMainWindowLayout::setGeometry() still isn't called at present. So QDockAreaLayout::fitLayout() will force the size of dockwidgets and centralwidget to be calculated using the wrong geometry, which will break the state restored by QMainWindow::restoreState(). This is a side effect of 692e9103ebb85b90e79377206d5d03b704d43d42. This patch is a backport of d2f65aa470fe30849a01380e4a50e8a4ebbce07e. Task-number: QTBUG-15080 Change-Id: I5b912e80e99b1f8b7a6f2a9a3e541fac3455c3db Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Debao Zhang <hello@debao.me>
* Document how to name threads.Mitch Curtis2012-11-281-0/+8
| | | | | Change-Id: Ia79f5dd4a55d5260032781eab2f74737d65729f2 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fixes problem with single precision floats in QDataStream (Windows).Christian Strømme2012-11-281-1/+5
| | | | | | | | | | | | | | When the floating-point behavior in MSVC is set to "precise" (default), assigning nan numbers to a float causes the bit pattern to be altered (only affects 32bit builds). We should therefore not assign the swapped value back to a float and use it. Backported from Qt 5 (3f936e9094f3a6e4d76791c1eff7ae92f91b61ae) Task-number: QTBUG-25950 Change-Id: I39725557ab89c978eb1c59a4c79df8a27ed70ecf Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Make textEditTest more tolerant wrt characterRect verificationJan Arve Saether2012-11-281-1/+6
| | | | | | | | | | | | | | | | Should become more stable due to two changes: 1. When QAccessibleTextWidget::characterRect() calculates the height, make sure the leading is not included. 2. Accept a small error (1) on height and width. It there is an error on the height or width, dump diagnostics This makes it pass with all Latin fonts on my system (roughly ~150 fonts), where it didn't before. Change-Id: I964207bad1f3ceb0103129501bdc857aff5885d2 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* BlackBerry: Fixed physical screen dimensions when rotatedBernd Weimer2012-11-281-2/+6
| | | | | | | | | | | | | libscreen will always provide the same physical screen dimensions regardless of the initial orientation. Width and hight will now be swapped appropriately (to make sure that the DPI value is correct). The Qt5 implementation is different (the qnx plugin takes the initial orientation into account). Change-Id: I983d1db7ae334b442597b62dde64d41bb991690c Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
* BlackBerry: Restore proper BPS channel in event dispatcherBernd Weimer2012-11-281-8/+36
| | | | | | | | | | | | This change ensures that BPS events are delivered to the proper channel even if the application code would change the channel. Backport from qtbase: 131b86347384a97a7044942acd723c4ef5669636 Change-Id: Ib2bdd3d973bc51f5ce85eb6ef9adcb3e57093a54 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Draw disabled QMenu items in inactive state in vista style.Friedemann Kleint2012-11-281-1/+1
| | | | | | | | Task-number: QTBUG-27992 Change-Id: I4ed5661cfe0d0a10143224b73fbad6fac4927a37 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/5223e7eb27dc15f8428aeb66dd8c57098dedce58)
* Fixed crash in tst_qglthreads.Samuel Rødal2012-11-281-1/+2
| | | | | | | | | | | | | | | QGLTextureCache has a read write locker to protect texture lookups. However, even calling QCache::object() might modify the cache, causing race conditions, since it modifies the priority order of the objects in the cache. Therefore, we need to protect it with a QWriteLocker instead of a QReadLocker. Task-number: QTBUG-22560 Change-Id: I46fffc624ace27e25fb100f865e1df0a19b9093d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> (cherry picked from commit 6633dbbac49f4ce8a89b67090fdffaa8c8126eb5) Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Do not detect directories ending in ".lnk" as link files.Friedemann Kleint2012-11-281-1/+6
| | | | | | | | Task-number: QTBUG-21863 Change-Id: I70b661fa5fcaba1293a80c971c506798826f5b23 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/1022c3ce9d445fd482a62309b9a6c52495c04a92)
* Fix multiple tablet hires coordinate bug under X11Ryan Stelzleni2012-11-281-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | On X11 if you have multiple tablet input devices, like a Wacom Cintiq and a Wacom Intuos tablet connected at the same time, one of the tablets will generate incorrect high resolution coordinates. The reason seems to be that when translating the XEvent in qapplication_X11.cpp the code searches for the first tablet device it finds that supports the type of the current event. Since both tablets will support this event type, we wind up always finding only one of the tablets. Specifically, the first tablet that was found when enumerating tablets during qt_init. Then all calls to QTabletDeviceData::scaleCoord are made on the same device, so the size of one of the devices is never used. That device will wind up with incorrect high resolution coordinates. When not running under IRIX the XEvent will have a deviceid which we can use to find the correct device to use for scaling. This change implements that fix. Change-Id: I667a52a729273a9b12880592d0a4cd7ce7f16106 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* BlackBerry: Changed QSettings file accessBernd Weimer2012-11-262-5/+28
| | | | | | | | | | | | | | On the BlackBerry platform, applications run in a sandbox. They are not allowed to read or write outside of this sandbox. Hence in QSettings there is no use for the system scope and differentiating between organization and application. This change will also improve performance. Backport from qtbase: 146f63bea487dbc4d6af34b56fa382f5a6a18e82 Change-Id: I0000d6910b56cdb75728422e1889cd5f0c646eb3 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* Fix moc from choking on boost headers.Kevin Kofler2012-11-251-0/+4
| | | | | | | | | Fixes several build failures with boost >= 1.48, for example the kdepim build: https://bugs.kde.org/show_bug.cgi?id=304111 Task-number: QTBUG-22829 Change-Id: Ic37a5290955fbfd18894a228cc9d57615edddea6 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix hover handling in QTreeViewMiikka Heikkinen2012-11-242-14/+12
| | | | | | | | | | | | | | | Cached hoverBranch could get invalid if branches were collapsed or expanded programmatically, leading to a crash in some situations. Fixed the logic for updating hovered over branch indicators and also now update hoverBranch when drawing so that it is guaranteed to be up to date there - this fixes issues like hover indicator not updating when the view is programmatically scrolled. Task-number: QTBUG-27158 Change-Id: I5bd1ad76aee512ad78df33959a84ead16886a47c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> (cherry picked from qt5/qtbase commit fd6a870136ab2fdb3ce8b516abcf8c05d45caba7))
* BlackBerry: Removed filtering of window system eventsBernd Weimer2012-11-232-6/+8
| | | | | | | | | | | | | Only one event type can be passed to the event filter in Qt4. For the BlackBerry platform this will be BPS events. This should be acceptable, as there isn't any documentation stating that it should be window system events for QPA ports. In Qt5 the implementation is different (it is possible to pass the event type along with the event itself). Change-Id: I95550cec8a04a4994479904bc68544742a458aa9 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Updated WebKit to 994432629cb04ffd8e1985dce9e9ed3a89236dd1Simon Hausmann2012-11-235-6/+15
| | | | | | | Includes fix for QTBUG-23258 and bumps the version accordingly Change-Id: Id5dd3c388cf6de88aea1b40bc9bdc2d5d6d80a31 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Fix error reporting in TDS SQL driver.Aaron McCarthy2012-11-231-2/+4
| | | | | | | | | | | | | | | | | | | | | The error and message handlers used by the freetds library were getting reset to back to the default every time a database was opened. The Qt TDS SQL driver was calling dbinit() from QTDSDriver::open(). This had two problems: 1. dbinit() would reset the error handler previously set by a call to dberrhandle(). A db error would then cause the application to abort. 2. freetds expects dbinit() and dbexit() to be called symmetrically. Opening multiple database connections would result in freetds not cleaning up on application close. Solved by moving the dbinit() call into the QTDSDriver constructor. Backported from Qt5/qtbase change 7456562e7f647e7cb2c854c4272c5599b26dbd37 Change-Id: I43087a44d74de38918c7285a228e2f3d25d070fd Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Qnx: Handle the MeasurementSystem in QNXmfekari2012-11-232-0/+100
| | | | | | | | | This is a back port from: 3853035a45abb87c94314ac9f61f0c454a7f0262 Change-Id: If31252555406cb7347e6f7b676cda3938c420f78 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* Fix regression in QXmlStreamWriter with codec set to UTF-16Jan Arve Saether2012-11-231-7/+25
| | | | | | | | | | | | | | | Actually, this broke using QXmlStreamWriter with any codec where characters in the ASCII range have a different encoding than the ASCII standard. This was a regression from 558fe9383ba0aecbec09cc411c0ebab132aac137 Backported from Qt 5 (035d93a6e1cbde76d34866ffd9b39633572e6236), and changed QStringLiteral to QLatin1String Task-number: QTBUG-23310 Change-Id: Iaaf25463737382ace1bdb83138c7dd634d825b30 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Make the rules for redirects a bit stricter.v4.8.4Richard Moore2012-11-221-3/+5
| | | | | Change-Id: I7a3cec664aa028202de3d3bda9f499e4deb2998d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Revert "QtConcurrent: Fix for leak in QFuture"Thiago Macieira2012-11-193-46/+5
| | | | | | | | | | This reverts commit 28b06b3ebae3d411c74f09fa7de52bc290c47dc3 That commit contains new symbols added in a patch release of Qt. That is not permitted. Change-Id: I1d36b50d4c26aa32072fd3f9c311a0e773527abd Reviewed-by: Christian Stromme <christian.stromme@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix regression introduced in QFileSystemEntry::path()Andy Shaw2012-11-181-1/+1
| | | | | | | | | | | | When fd2eb070128ab6ef6b5c9343a0921f6b5a0bc041 was backported it shouldn't have included the change to path() as this introduced a behaviour change. This reverts that part of the patch so it is back to Qt 4.8.2 behavior. Task-number: QTBUG-27356 Change-Id: I7c19dda473e7aa2c53baed961c3b0e0d322362fe Reviewed-by: João Abecasis <joao@abecasis.name>
* Fix compile issue with building with openssl and in a namespaceAndy Shaw2012-11-181-7/+11
| | | | | | | Task-number: QTBUG-25207 Change-Id: I20ab722d3fcb74d90d9010c5c7c303f586e0d7c7 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Make the qatomic classes work in ARMv5 OABI.Tomasz Duda2012-11-181-0/+16
| | | | | | | | | | | | | | | | The function testAndSetOrdered is not atomic. The context of a thread may be interrupted inside testAndSetOrdered and then if another thread calls fetchAndStoreOrdered, _q_value may be overwritten. After that _q_value will contain random value depending on where testAndSetOrdered was interrupted. It should not be possible for the atomic classes. Since the commit 8a7b5aca7b6575013a4e4ee9b99808d25edf6fdf introduced new implementation of QMutex for linux the bug causes deadlock. Change-Id: Ib9ffcf0e26d3be36a0e158fd12a363b97177dcbf Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QString doesn't work with old ABI on ARM.Tomasz Duda2012-11-172-2/+11
| | | | | | | | | | | | QString doesn't work on ARM platform with old ABI because QChar has wrong size. Macro Q_PACKED was removed by commit 1ec8acd77b6c048f5a68887ac7750b0764ade598. Some projects still use old ABI. It is better to check version of ABI during compiling. Task-number: QTBUG-15784 Change-Id: I92180b864679e01363fa837260707b67674d0a26 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fixed memory leak in assign operator of QGLBufferVadim Zakondyrin2012-11-171-1/+3
| | | | | Change-Id: I90b7e3f352fb7ceea7befabbab7d3b67213dd45f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Blackberry fixed crash when plugging in a secondary display.Fabian Bumberger2012-11-162-4/+4
| | | | | | | | This bug is only in the Qt4 version of the plugin. In Qt5 attaching a screen works just fine. Change-Id: I45ebc51c6da9999e7d2e4f453379fbc18dd6f857 Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* When clicking on a menu item which has a sub menu it should not closeAndy Shaw2012-11-151-0/+3
| | | | | | | | | If you clicked on a menu with a submenu then it should do nothing as this is what the native behaviour is on Mac. Task-number: QTBUG-10706 Change-Id: I7c8898b4b35a8189e1a8270d8a528eb56c81aed7 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* On 32bit applications it would not get out of the waiting stateAndy Shaw2012-11-151-1/+1
| | | | | | | | | Specifically for 32bit applications it would not get out of the waiting state when using the Cocoa API, the QuickTime API works fine in this respect so we can fallback to this instead. Change-Id: I768009c1e90e8c67ed518288971f11c3e7a1c2ee Reviewed-by: aavit <eirik.aavitsland@digia.com>
* Fix zero-duration animations running Backwards.Andreas Aardal Hanssen2012-11-151-1/+2
| | | | | | | | | | | | | | | | | | | If you set the duration of any variant or property animation to 0, its progress will be stuck at 1 (0..1), and its "end" value set on the target object, after start() has been called. If you change the direction of the animation to QAbstractAnimation::Backward, you would expect the progress to be 0 after start. Instead it's still 1; the code seems to assume that if the duration is 0, the progress must be 1 always. The fix is that if the duration is 0, the direction is checked to determine whether progress should be 0 (Backward) or 1 (Forward). Task-number: QTBUG-27969 Change-Id: Ibeca084bbbce41df1dca7b7d96c15b6b54394996 (cherry-picked from qtbase/f3597af5adcd2275503e9e4bfb425549f9ab3ced) Reviewed-by: Thierry Bastian <thierryb@filewave.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix scrolldown arrow not showing on popup for QMenuMiikka Heikkinen2012-11-141-2/+4
| | | | | | | | | | | | | | | | | Scrolldown arrow was not shown when a taller than screen QMenu was opened because the check to draw it used the size that was already adjusted to the screen. Fixed by using the actual menu size in the check. Also fixed the case where the menu was scrolled, closed, and reopened, in which case the size hint would return incorrect cached value. This led to scrolldown arrow not being shown in case the menu was previously fully scrolled down. Task-number: QTBUG-27445 Change-Id: Icd8d774071662a9317b3ac53cb05b31cadba96ff Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> (cherry picked from qt5/qtbase commit fe8eb057fa05433e96de21df34871647f421f962))
* Windows: Fixed handling of key events containing ctrl modifierOliver Wolff2012-11-141-0/+8
| | | | | | | | | | | | | | | QKeyEvent::key() returned the wrong value if the ctrl modifier was used in that key event. That was due to the fact that ToUnicode might not return the correct code for these events/keyboard states. While it works for alt+shift+= (us layout) and gives '+' as unicode value it just claims that it cannot translate the given state for ctrl+shift+=. So if the control modifier is used and ToUnicode return 0 toKeyOrUnicode should try again without the control modifier. Task-number: QTBUG-10781 Change-Id: I771f7ed18bcce60d1c7c3f6157d169d4e80ddd60 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Don't use Cocoa code unconditionallyAndy Shaw2012-11-141-0/+2
| | | | | | | | | | | The Cocoa code should only be used if QT_MAC_USE_COCOA is defined, this was causing problems in Carbon with menus which are now resolved. Task-number: QTBUG-27960 Change-Id: I60186d69a869def4b2f03f1b0fdde82208fcfbe5 Reviewed-by: Pasi Matilainen <pasi.matilainen@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
generated by cgit v0.12 at 2025-04-22 10:29:02 (GMT)