summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-0720-40/+139
| | | | | 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>
* support indirect SUBDIRSLucas Wang2012-12-062-2/+8
| | | | | | | | | | that is, .file and .subdir "structs". (cherry picked from commit 3460395ebbf1e9eb05419854c0d5de28b89b9b0a) Change-Id: Ifdeedbbc0bccc9bc7a21707152750d7a2e839a5c Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Clear focus of GraphicsItem focus scopes and their children.Andrew den Exter2012-12-052-3/+48
| | | | | | | | | | | | | 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>
* BlackBerry mkspecs: optimize linker flagsPeter Hartmann2012-12-042-0/+4
| | | | | | | | | | | | | * relro makes some sections read-only before giving control to the program; * now resolves all symbols when the program is started and allows for the GOT being marked read-only to prevent it from being overwritten. These settings have been used internally for device builds already. Change-Id: I03576d4fd1585ad566865e2a7a0341b3e13c3b06 (cherry picked from commit c8c8e1990ce74590739bd52874e38e03e3d64825) Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* configure.exe: add inotify command line switchRafael Roquetto2012-12-031-0/+12
| | | | | | | | | akin to qt5/qtbase 31468563892a184d0a45cb0fdd7a91fa0da681e7, but without feature auto detection due to Qt4 configure.exe nature. Change-Id: I481e9ee01692dab9bd267a7b14722b8471719d1a Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.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>
* Updated changes-4.8.4 filejutaipal2012-11-291-12/+128
| | | | | | | Change-Id: Ibf1cfd47ef1e1694491d448f7dd73a338aad7043 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.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-283-8/+78
| | | | | | | | | | | | | 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>
* Detect QMainWindow-separator as passive interactor in Qt Designer.Friedemann Kleint2012-11-281-2/+6
| | | | | | | | | Ensure that dock widgets in Qt Creator can be resized. Task-number: QTCREATORBUG-8284 Change-Id: If6aa55b2dde8fce53e1527db678f518b3912907b Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> (cherry picked from qttools/5e4bc7e3556cb5afcd82731277bdef60ae2cbe33)
* 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-282-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-282-1/+49
| | | | | | | | | | | | | | 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-282-8/+68
| | | | | | | | | | | | | | | | 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>
* Device mkspec for Blackberry PlaybookRafael Roquetto2012-11-284-0/+98
| | | | | | | | | This defines Q_OS_BLACKBERRY_TABLET. This define is not necessary on Qt5. Change-Id: I2e2553f3b33d896df9e219c12e738251eed8a231 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@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)
* BlackBerry mkspecs: use compiler flags for C++ and C compilerPeter Hartmann2012-11-282-0/+5
| | | | | | | | | | | | | ... and not only for the C compiler. Apparently the logic has changed between Qt 4 and Qt 5. This commit is not needed for Qt 5, because there we set the CXXFLAGS after parsing the BlackBerry mkspec file. Change-Id: I225d636586d19fa0e2b0d5a644071202774a385c Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* 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-282-1/+13
| | | | | | | | Task-number: QTBUG-21863 Change-Id: I70b661fa5fcaba1293a80c971c506798826f5b23 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/1022c3ce9d445fd482a62309b9a6c52495c04a92)
* qmake: do not exclusively lock files for reading on Windows/MSVCJoerg Bornemann2012-11-281-1/+1
| | | | | | | | | | | | | When sifting through a file to find Q_OBJECT and friends, qmake was locking it for reading and writing (_SH_DENYRW). This breaks parallel builds where multiple qmake instances might want to scan the same file. Changed the sharing constant to _SH_DENYNO, which doesn't lock the file at all. This is consistent with the _sopen_s call in findDeps. Change-Id: I9c0a06db7f580f411e79d9d96dd36a6d705679aa (cherry picked from commit 9cd7eb29f3b216bdac215fb7633b4b51d534d220) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* 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>
* test: Remove insignificant_test from tst_QXmlQuerySergio Ahumada2012-11-261-2/+0
| | | | | | | | | The test is now passing on all CI platforms. Change-Id: I205d8d6951c64f5eca3b2f7ea4d6c362ab046fda Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Mark some tst_QHostInfo functions as XFAILSergio Ahumada2012-11-261-0/+14
| | | | | | | | | tst_QHostInfo::cache() tst_QHostInfo::abortHostLookup() Task-number: QTBUG-28079 Change-Id: I6f524cdee86bc77583852327e18c6d4a79595323 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* BlackBerry: Changed QSettings file accessBernd Weimer2012-11-263-6/+88
| | | | | | | | | | | | | | 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>
* BlackBerry mkspecs: tell compiler the specific ARM version (cortex-a9)Peter Hartmann2012-11-251-0/+2
| | | | | | | | | | | ... so the compiler knows which instructions to generate and can optimize for the specific CPU. All BlackBerry platforms are Cortex-A9 compatible. (cherry picked from commit 44b1c5dde2dfbb69a29cbd4ad8d1f0ac0203b482) Change-Id: I730dea78421d4688e0afa60f8f095f3166e5b733 Reviewed-by: Sean Harmer <sean.harmer@kdab.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))
* test: Mark some tst_qdeclarativetextedit functions as XFAILSergio Ahumada2012-11-231-4/+24
| | | | | | | | | | | | tst_qdeclarativetextedit::cursorDelegate() tst_qdeclarativetextedit::implicitSizePreedit() tst_qdeclarativetextedit::preeditMicroFocus() tst_qdeclarativetextedit::inputMethodComposing() Task-number: QTBUG-28109 Change-Id: Icb887ccb4d41a90472cf99342c9f2e500289f920 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Mark tst_networkselftest as insignificant only on WindowsSergio Ahumada2012-11-231-1/+1
| | | | | | | | Task-number: QTBUG-27571 Change-Id: I93e55996158f4c5c18c65cc56877f21448d4564e Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Remove QSKIP from tst_QGraphicsItem::updateMicroFocus()Sergio Ahumada2012-11-231-4/+0
| | | | | | | Task-number: QTBUG-9578 Change-Id: I8645f2154ab3cc9a414bec425abc5c08605866e1 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* test: Mark tst_QPauseAnimation as insignificant only on WindowsSergio Ahumada2012-11-231-1/+1
| | | | | | | Task-number: QTBUG-28069 Change-Id: I3e73a2f9af44735a0b50711f89ae57967a6fde0b Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* test: Mark tst_qdeclarativexmlhttprequest::send_ignoreData() as XFAILSergio Ahumada2012-11-231-1/+3
| | | | | | | | | | object->setProperty("reqType", "DELETE") always fails. Actually, this part of the test does not exit in Qt 5. Task-number: QTBUG-28004 Change-Id: Ia60f8c1c9bb4e780396327e8f8231771cec6889a Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* 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>
* auto tests: only build help autotests when not cross-compilingPeter Hartmann2012-11-231-1/+1
| | | | | | | | | | ... because QtHelp and all other tools are only built when not cross- compiling. In Qt5, this is already fixed in the qttools repo. Change-Id: I151f8b4abe129def9f5f3717e72dea7dbd31fd73 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.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-232-2/+36
| | | | | | | | | | | | | | | | | | | | | 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-232-7/+47
| | | | | | | | | | | | | | | 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>
* tests: Mark flaky tests as insignificantSergio Ahumada2012-11-222-0/+4
| | | | | | Task-number: QTQAINFRA-574 Change-Id: I385818d81d2565285e9402c0b6d63938f9019081 Reviewed-by: Richard J. Moore <rich@kde.org>
* Revert "QtConcurrent: Fix for leak in QFuture"Thiago Macieira2012-11-195-111/+13
| | | | | | | | | | 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 failing tst_QWidget_window::tst_showWithoutActivating() test.Mitch Curtis2012-11-181-0/+1
| | | | | Change-Id: I3d7acf98f12ff71a6cea803ff7af430c66b972b8 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
generated by cgit v0.12 at 2025-09-23 12:54:44 (GMT)