summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Harfbuzz: backporting fixes from upstreamAhmed Saidi2013-04-187-14/+23
| | | | | | | | | | | | | | | 81c8ef785b079980ad5b46be4fe7c7bf156dbf65 Fix crash! 81f2ecafa19b602f950df5a9e6e1b99c4b5ea55e Bug 30319 ff0612c2e7df1b86fc702c72e3015a6a5ae39b4c and 2dbd0fd11799c18bb6c66e337c3e31a1419823d4 Fix OOB access possibility 3bebe289aace6daa84b3d6983cebf5c58ddfad78 Fix problem with Indic shaper and control chars 90138e5a4d15c44f05456f90083ecacdc3196c8e Fix bad memory access in Myanmar shaper b847f24ce855d24f6822bcd9c0006905e81b94d8 Fix Arabic cursive positioning 3ab7b37bdebf0f8773493a1fee910b151c4de30f Fix misc leaks Change-Id: I6f3a6253782bff6abe4bf741d11c09fdd67542db (cherry picked from qtbase/7df995a9bd3e989b4136f98424490604eb5178aa) Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Prevent recursions when triggering menus in QToolButtonFrederik Gladhorn2013-04-171-0/+3
| | | | | | | | | | | | With a global shortcut set it would be possible to let the button re-open the menu again and again, each time spinning an event loop. Backport of f5ea183cc6a6cd66fb3f804041fc112687e0a060 from qtbase Task-number: QTBUG-30399 Change-Id: If7eddc115c77fef3df3e751fd72e7414cedaf272 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Prevent crash when moving elements of a ListView's ListModel.Mitch Curtis2013-04-171-1/+2
| | | | | | | | | | QDeclarativeListView::itemsMoved wasn't checking if its list of visible items was empty before accessing its first element. Task-number: QTBUG-26836 Change-Id: I5ed42889a55026f19e44e44d14080a61fff63b59 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* QNetworkConfigurationManager: check whether app is shutting downPeter Hartmann2013-04-161-1/+4
| | | | | | | | | | | | | | | | | ... before trying to update the configurations. Before, we would check whether the pointer to the QNetworkConfigurationManagerPrivate instance was 0 and in that case construct it. This would mean that this code path was taken "at app shutdown", i.e. when the qAddPostRoutine had already been called but the other statics were still accessed. Note: This is not thread safe, but neither is the rest of the code; making it thread-safe would require additional changes. Task-number: QTBUG-30585 (backport of commit cc028650e590ac49293558099b3fb87720e9793b) Change-Id: Ifaae4d758a10b44bc7f838cdc0d3a1129ed63228 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Rename qAbs Function for timevalDavid E. Narváez2013-04-131-3/+2
| | | | | | | | | | | This decouples it from qAbs which is declared as a constexpr under certain compilation flags and enables for qtbase to be compiled with GCC 4.8 Change-Id: I78e02256ffc8b460ca74ae5241e77dfac4e09ba9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry-picked from qtbase commit d9ff510f02bba63dabe7a081a68296056a89ae4c) Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Silence warning from clangBradley T. Hughes2013-04-131-1/+1
| | | | | | | | | | | | | | | | | | | The original intent was most likely to memset() the entire MD5Context to zero at the end of MD5Final(), which we do now. In file included from tools/qcryptographichash.cpp:49: ...qtbase/src/corelib/../../include/QtCore/../../src/corelib/tools/../../3rdparty/md5/md5.cpp:139:24: warning: argument to 'sizeof' in 'memset' call is the same expression as the destination; did you mean to dereference it? [-Wsizeof-pointer- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ ~~~ ^~~ Change-Id: I793c6f0944b89c0e4c5f9253cdb1071175c17152 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry-picked from qtbase commit 2bce4627e63947a3ed55009aeb8ff38974e444d3) Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* QGtkStyle: remove an unnecessary sanity check for theme nameDmitry Shachnev2013-04-111-4/+1
| | | | | | | | | | This makes QGtkStyle working again on Debian experimental and Ubuntu 13.04, where getThemeName() returns empty value. Backported from QtBase b72aa1cad30a44b1. Change-Id: If4cc822970088a5fb31aa28d9951db1efc0bb4fd Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* BlackBerry: Adjust rotation according to initial orientationRafael Roquetto2013-04-113-0/+14
| | | | | | | | cherry-picked from qtbase f0425e115e5fe5d29191f0752659a28e9a4b6757 Task-number: QTBUG-29201 Change-Id: Iec31057749d98d66d43f13635da20d097756c8ea Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Remove unnecessary typedef, found by GCC 4.8Thiago Macieira2013-04-101-1/+0
| | | | | | | | | qtconcurrentfilter.h:108:47: warning: typedef 'Iterator' locally defined but not used [-Wunused-local-typedefs] Qt5 commit: d4c241a98059edaa7a4b15beb1cfd16ed041284e (qtbase) Task-number: QTBUG-30594 Change-Id: Icc69e41c2d4e11962f0c8434236d4847b46e7d9d Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Added support for multicore CPUs in QThread::idealThreadCount for INTEGRITY ↵Florian Behrens2013-04-091-1/+7
| | | | | | | | | | target. Cherry-picked from qt5 commit 90361fd36c803c4c5c28d67f05ed66f619e0d39c. Change-Id: If13954d40d07aebf08b9a143964038c0996c325f Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QWizard/Win: Support RTL layout in Aero styleAhmed Saidi2013-04-082-3/+25
| | | | | | | | | Task-number: QTBUG-30462 Change-Id: Ie6b3ba4975542a9d92611eb9a8547215e41d3c2c (cherry picked from qtbase/6f0dc9f4c7c1405bdbfef32395d0fb091bb0c8c8) Reviewed-by: Ahmed Saidi <justroftest@gmail.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Avoid socket notifiers on invalid file descriptorsBernd Weimer2013-04-081-5/+4
| | | | | | | | | | | There is potential trouble and no point in registering a QSocketNotifier on an invalid file descriptor. This is prevented now in addition to the existing warning. Backported from qt5/qtbase: d20851f8ecd044479dd1892e92937a9135aa7856 Change-Id: I86e0a2c7ebdc6fb4cffcd39958003506ff01cb46 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Compile with clang when C++11 support is enabledBradley T. Hughes2013-04-081-1/+1
| | | | | | | | | | | | | text/qtextdocument_p.cpp:1070:43: error: non-constant-expression cannot be narrowed from type 'int' to 'quint32' (aka 'unsigned int') in initializer list [-Wc++11-narrowing] text/qtextdocument_p.cpp:1070:43: note: override this message by inserting an explicit cast Cherry-picked from qtbase/6deebc817080f9eb86d5d6fbe50444678eed4dfe. Change-Id: Id3faf59a8d30dc829b82508c4be50439db1d9722 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use LC_MESSAGES instead of LC_NUMERIC in QSystemLocale::fallbackLocale()Dmitry Shachnev2013-04-071-1/+1
| | | | | | | Backported from QtBase 7dfee3ffc5129307. Change-Id: I5e7d0116ed95ede87c97d8ac2b9eff3b922818f7 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fixed a bug where the MaximumSizeHint of a layout with spans was wrongJan Arve Saether2013-04-051-0/+2
| | | | | | | | | | | | | | This was spotted while tracking down a similar bug related to spans. This now also eliminates the Q_EXPECT_FAILs in heightForWidthWithSpanning(), since it now finally works. The problem was only for the maximum size, since the size of an ignored row/column was min: 0, pref: 0, max: FLT_MAX (the default constructed values for a QGridLayoutBox). Change-Id: Ibb33c26ede40ed02edd26f596ba6133d59c9962f Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> (cherry picked from qtbase/9d7ae6dfbe25fb70a362a4cf955c187cd24cb007)
* Fix a bug in QSystemLocale on BB10El Mehdi Fekari2013-04-042-18/+20
| | | | | | | | | | | Call qt_safe_open in the constructor to avoid opening the pps files several times. backport: f1d8987b82ce6b0a852b715a8713608bfd72aabf Change-Id: Ia6b8ca339fa2f9f85df28792e95242b6ff7b70ca Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fixed a bug where spans across empty cells got broken.Jan Arve Saether2013-04-041-1/+1
| | | | | | | | | | | | | | | | If a row/column is only used only because of the spanning of an item, the cell should be treated as it didn't exist. We keep track of this with the "ignore" bit array. The old code would always start from the row/column at position 1. In the attached testcase this made the effectiveRowSpan become larger than actually needed. Task-number: QTBUG-30255 Change-Id: Ief0e7018ee8e5ee36272ce075a43312ffeac7b91 (cherry picked from qtbase/f9e43c526a30ae3912adfe3d5cb781af5ddda4b0) Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Adding transformed support for QNX QWS pluginKarim Pinter2013-04-044-12/+70
| | | | | | | | | | | It implements the setDirty function which is called by the transformed plugin when the screen is rotated. The rotated image is in the surface memory, just the bliting is done here. Task-number: QTBUG-29949 Change-Id: I0be2d037d6e1ef85106175aa47cc548b99b05a94 Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* BlackBerry: Added warning when low memory event is receivedBernd Weimer2013-04-031-0/+6
| | | | | | | | Low memory warning has been added for debug purposes. Backport of 6b413dc32c485853710352a95e8bef928682558a Change-Id: I79b3815d314227634b739935d85248cc526f2c89 Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* BlackBerry: show dialogs full screenRafael Roquetto2013-04-021-0/+8
| | | | | | | | | | | | Except for message box, which will have their optimal geometry calculated at runtime. This fix is not necessary on Qt5 Change-Id: Ida4743acdceb5424ab93aa3a32c78db61dd6795c Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Windows: Fix the last file dialog bottleneck.Sergio Martins2013-03-284-4/+11
| | | | | | | | | | | | | | | | | | | Went from taking 30 seconds to 2 seconds, on a SDCard with 10k files. Windows file dialog does not resolve NTFS symlinks, it just shows an empty icon, and the link name, not the target. This allows for a big performance gain by reducing the number of calls to GetFileAttributesEx() by checking the extension directly. This also fixes the problems with the native file dialog, which for some reason, is creating a QFileSystemModel too. Task-number: QTBUG-13182 (cherry picked from commit 51f00deffac49c4277425837f0132b0c721bb689) Change-Id: If7bd63d68e1870c5e48907ae79f4c4bdc6972b00 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Windows: Fix one of the two file dialog bottlenecks.Sergio Martins2013-03-281-1/+14
| | | | | | | | | | | | | | This patch reduces the number of calls to GetFileAttributesEx() when icon lookup is being done. The second bottleneck is a couple of isSymLink() calls. Will fix that next. Task-number: QTBUG-13182 (cherry picked from commit a7f6f32fadd5024697c16dfcbc07d6d11beb45fa) Change-Id: If42b791d22fe0429a3b43992bad037afad09c448 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QMdi: Don't emit subWindowActivated during StyleChange handling.David Faure2013-03-281-1/+7
| | | | | | | | | | | | | | | The handling of StyleChange de-maximizes the child window temporarily, which was emitting subWindowActivated. This would crash lokalize, because deactivating a window means deleting the widgets associated with it, and style-change handling is done in QApplication by looping over QApplication::allWidgets, which would then contain dangling pointers. Full valgrind log at https://bugs.kde.org/show_bug.cgi?id=271494#c7 Change-Id: I256da214bf00fd7925dcee67b4f0414e57fc453b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> (cherry picked from qtbase/a6e5ccbe223c5a606e15556e8708e863442d9f72)
* Backport some enum optimizations from Qt 5Alan Alpert2013-03-271-11/+33
| | | | | | | | | | | (backport of 108b9bbe2ff2f5f31525408a08d248499d95a49f in qtquick1) Saving the int when we check the enum is valid allows us to make it a literal assignment instead of a binding, which is much faster on object creation. Change-Id: Ieb174289438a17574c4716df372b04d4dee6d0db Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* QNonContiguousByteDevice: roll back complete internal state in reset()Peter Hartmann2013-03-261-0/+6
| | | | | | | | | ... otherwise we would not start reading from the beginning when the device was reset. Change-Id: I897adbad6e1f240fa871758ec7e3d6b499cb5944 (cherry-picked from commit ffe45f1896adfff93258b917f6a566dcc06a6597) Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* SSL code: store SSL parameters for debugging, guarded by definePeter Hartmann2013-03-251-0/+35
| | | | | | | | | | | | | ... so SSL traffic can be decrypted with e.g. tcpdump / Wireshark. For this to work, the define needs to be uncommented and QtNetwork recompiled. This will create a file in /tmp/qt-ssl-keys which can be fed into Wireshark. A recent version of Wireshark is needed for this to work. (cherry-picked from commit 1f180e9690a0a5f6cc849c1988ccda13de1b1e20) Change-Id: I413ffd2494c780f92ccad7e4fdc11b790966e7ce Reviewed-by: Richard J. Moore <rich@kde.org>
* QWindowsVistaStyle::drawPrimitive(PE_Frame): fix background clippingJ-P Nurmi2013-03-211-10/+7
| | | | | | | | | | | | | | | The purpose of PE_Frame is to draw the frame, not the background. The old code tried to check whether a custom base brush was set, and otherwise let the theme draw the background. That didn't work together with CSS background images. This change removes the background drawing from PE_Frame, and let's PE_Widget to draw the background using the base brush that defaults to a color fetched from the theme. Task-number: QTBUG-24783 (cherry picked from qtbase/f1e681bed21e131864fe1e1c91679f7a56b06823) Change-Id: Ief256d1d5861abc95dedf0b5d0a4f8e338c48941 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Make QPixmap::grabWindow work on retina displays.Morten Johan Sørvig2013-03-201-1/+4
| | | | | | | Scale by qt_mac_get_scalefactor. Change-Id: I94cd4e0b2f81f7a83f14ff018e772dad1da10284 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Use [NSScreen backingScaleFactor] on 10.7+Morten Johan Sørvig2013-03-201-2/+7
| | | | | | | userSpaceScaleFactor is deprecated. Change-Id: I892cb579e4b3ef9226495759c884d0e74c85a1d6 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fixed QPainter::drawPolyline() not drawing solid lines.Samuel Rødal2013-03-201-1/+16
| | | | | | | | | | If a line segment isn't filled we keep using the same point of origin. Task-number: QTBUG-26156 Change-Id: I20af8410a7039b69848f201ab62fd3c01b95531b Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> (cherry picked from commit b528e1324add2208abf8f83fb51a8bd2183157f5)
* Fixed artifacts when drawing same line with different clips.Samuel Rødal2013-03-201-6/+6
| | | | | | | | | | | Expanding on the change fixing QTBUG-24762 with the realization that any line needs to be drawn in a consistent way regardless of system or painter clip, not just dashed lines. Task-number: QTBUG-25036 Change-Id: Ief7ef19cc92c52e7d792500a581a072ba032767e Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> (cherry picked from commit c7191d3e214b9cdb17ec383b61f7e21e784f80d0)
* Inital port of QSystemLocale on BlackBerry 10El Mehdi Fekari2013-03-205-107/+422
| | | | | | | | Backport of: a0c4a712263dbacd2c8d95da64e00bd213d05cbf Change-Id: I4253067b42a8aa93325d48eeaa3a9937be2d2b75 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Fixed bug in QTimeLine::setPaused(false)Jan Arve Saether2013-03-201-0/+3
| | | | | | | | | | | | | The problem was that the elapsed timer was not restarted, causing the currentTime() not being adjusted for the time it was paused. (cherry-picked from Qt 5: 75614792fa2370b6b0402117bf) Task-number: QTBUG-30108 Change-Id: I9718aa408075623514717328321c34e7ab3af436 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Reorder for performance reasons.Sérgio Martins2013-03-192-2/+2
| | | | | | | | | isSymLink() can be expensive in a few cases. Change-Id: Ib8b9f0c13d7ce141a539a4729be81d9faa4382ea Reviewed-by: David Faure (KDE) <faure@kde.org> (cherry picked from commit 1975e65d73ef2bf225bd765e6b50b6f50167f71c) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Improve emission of FocusScope focusChanged signals.Andrew den Exter2013-03-192-18/+29
| | | | | | | | | | | | | | | | | | | | | | | Emit activeFocusChanged up the focus tree when an item receives a focus event, rather than when the focusItem changes which happens before internal state is sufficiently updated for hasFocus and hasActiveFocus to return the correct values from within a changed signal handler. There are some limitions to this. First the signals are not emitted reliably when the scene is not active which makes sense for activeFocus but not for focus. The second is in some instances the focus and activeFocus can update unnecessarily while the focus chain sorts itself out. QDeclarativeItem tests by Andreas Aardal Hanssen <andreas@hanssen.name> Task-number: QTBUG-28288 Task-number: QTBUG-25644 (cherry picked from qtquick1/c520a69f06317fb90d37324bf284ef9614cb5dbf) Change-Id: Iac12bf8c95cbf3525b454f4afca06a54a5c14b4e Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name> Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* QThread::isFinished should return true from finished()Olivier Goffart2013-03-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | and isRunning() should return false. This restore the Qt 4.7 behaviour In Qt 4.7, the finished() was called with the thread's intenal mutex locked. Which mean that: - Call to isRunning or isFinished called from a slot connected to finish within the thread would deadlock. (Hence no compatibility to keep here) - Call to isRunning or isFinished from a slot connected with QueuedConnection in another thread would lock the mutex until the destructors are finished. and then return as if the thread have finished. Change-Id: I963eccae8f7634aff90cc4bbab6ca886a78e35eb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry-picked from qtbase commit ec5e59b73c20a7dc6aec96c829f1e53c3fa58c07) Task-number: QTBUG-30251 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* WebKit: Fix using macro to determine Mac user agent architectureJonathan Liu2013-03-181-1/+1
| | | | | | | | | | | | Using || operator with #ifdef is incorrect. As a result, the architecture for the user agent is incorrectly set to PPC on an Intel Mac. This is a partial backport of r128775 in WebKit upstream. Task-number: QTBUG-30187 Change-Id: I6842f113fd024ababaf67e76dfee8f93e0988d08 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Remove the usage of undefined QFontDatabase::WritingSystemLiang Qi2013-03-161-8/+0
| | | | | | | | | There is no definition for Yi, Tagalog...Braille in QFontDatabase::WritingSystem, see the header file. (cherry picked from commit qtbase b7b858595e6e2d8dcc9debeb45eb8b9b294b9be6) Change-Id: I0d3625c58310d9af680799d20867f04b42845ca9 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Clear the alphaCache when starting new paintingAndy Shaw2013-03-141-1/+1
| | | | | | | | | The alpha cache needs to be cleared when starting a new paint otherwise it will assume that some elements already exist in the PDF when they don't. Change-Id: I97451c53c0c99b80a25a057735cef7b3bb830a7a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Fixes: assert in QPainter::fillRect on very large paint devicesaavit2013-03-141-0/+2
| | | | | | | | | | For devices taller than 32768, fillRect with linear gradient would go below the cliprect. Task-number: QTBUG-26766 Change-Id: I516ede1545909e9ce2de5812c61bb473f99f5759 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> (cherry picked from qtbase/db775741ed57efc16c697471f5b87689df7105a8)
* Fixed dashes being rendered differently depending on system clip.Samuel Rødal2013-03-144-18/+24
| | | | | | | | | | | | We need to clip lines to the unclipped device rect in the case of dashing, since otherwise the dashes will be shifted and rendered differently when partial repaints are done. Task-number: QTBUG-24762 Change-Id: I3599b54baa552acc20bf8cc2e12f846b45f6019e Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> (cherry picked from commit a12f6ba302e54c1570c54aa4c722f2dafbf794af)
* Update Irish locale to return correct date formatEl Mehdi Fekari2013-03-131-2/+2
| | | | | Change-Id: I89ad9b97dba6f76d34a23ec03b119fb51e592917 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fixed QTreeWidgetIterator to work with sorted QTreeWidgetJan Arve Saether2013-03-131-5/+4
| | | | | | | | | | | | | We cannot access children directly, since that won't ensure that the pending sort is executed. However, the functions we need are there already and actually makes the code nicer. Task-number: QTBUG-29903 Change-Id: I6899284275dd79b991896a5f08486b58d95f819d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> (cherry picked from qtbase/aa2d10750ad8cdb6a86d519063664c2924b2a635) Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Workaround a bug in mktime on QNXFabian Bumberger2013-03-131-0/+10
| | | | | | | | | | | | | Under certain circumstances, mktime failes to convert the tm struct into secs since epoch. This is a workaround and fixes the qdatetime and qqmllocale autotests. Backport of: 56820382f26 Change-Id: I7d819aad2d6901cd096b441f2c18fd97108d9abb Reviewed-by: Mehdi Fekari <mfekari@rim.com> Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Updated WebKit to 5fc7dcbe084a8ee8beda11b92dc2111be1285434Simon Hausmann2013-03-135-3/+38
| | | | | | | | | This brings in a fix for QTBUG-30081 as well as a backport of https://bugs.webkit.org/show_bug.cgi?id=103529 Change-Id: Ibcebe76d6999dc304d4c0323bbfa44be93909285 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Add WindowStateChanged eventRafael Roquetto2013-03-065-0/+37
| | | | | | | | | | Not currently considering activation state. backport from qt5 8dc2f81c9f0e6eb8cab09e5d682358fd140b49b8 Change-Id: Ib46e554b08cc8d15f83e9865a8f0be3f8d7b9d16 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* BlackBerry: handle window state navigator eventsRafael Roquetto2013-03-056-7/+75
| | | | | | | | backport of qt5 439002cddeb32766ea9806ac8b5cf9a973ed0f13 Change-Id: I2431ebd1240ba6f3c2b690b311301d222ec10865 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QSslConfiguration: toggle on demand loading of root certs properlyPeter Hartmann2013-03-044-1/+21
| | | | | | | | | | | | | | | | | make sure we keep track of when we can load root certs and when we cannot (we cannot when the developer set the certs explicitly). This is implemented the same way for QSslSocket already, and needs to be duplicated because we have 2 methods for setting CA certificates: one in QSslSocket and one in QSslConfiguration. In addition, adapt the auto test which checks whether setting a default QSslConfiguration works: There is no way to set on demand loading through the API, so it should be enabled by default. Task-number: QTBUG-29103 (backport of commit ce35c0db0d9dd849c736eabaeb57d597186aaa13) Change-Id: Idf15c21092c7727e1080b1c261ce055f30dbcf63 Reviewed-by: Richard J. Moore <rich@kde.org>
* Fix CreateFileMapping() error handlingPeter Kümmel2013-03-012-4/+5
| | | | | | | | | | | CreateFileMapping() returns NULL in case of an error. The patch corrects the wrong testing on INVALID_HANDLE_VALUE, and sets NULL for invalid handles. Change-Id: Iaab4945ed88ee92bbf9a0871e95a5820dd1a56ed (cherry-picked from qtbase/1a8f67938c4146614fec3788c7868dc1a314cc84) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add support for SQLSTATE error codesAndras Mantia2013-02-281-12/+18
| | | | | | | | | | | | | | | Postgres can report detailed information about an error using error codes. See http://www.postgresql.org/docs/8.1/static/errcodes-appendix.html . The current driver doesn't report the error, nor is it supported by the QSqlError object. The patch appends the error to the error message, helping applications to: - handle different errors in a specific way - show correct, translated error messages, independently on the language of the postgres installation Change-Id: I5c7792606307afdefaeae37c512949c85c2c7674 Reviewed-by: Mark Brand <mabrand@mabrand.nl> (cherry picked from commit qtbase/8ccab9b029ed2a2444d89a9cfc6c4a1866b8e82d) Reviewed-by: Andy Shaw <andy.shaw@digia.com>
generated by cgit v0.12 at 2024-12-27 09:39:35 (GMT)