summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Windows: Add missing colors to tooltip palette.Friedemann Kleint2014-05-091-0/+4
| | | | | | | Task-number: QTBUG-38183 Change-Id: Ic3581cc87c0d61140624ddaf6fa85d682120ad4f Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> (cherry picked from qtbase/9fc0c5466238eb8f43d2736d298ac36c65da529e)
* Fix visual index lookup in QTreeViewPrivate::adjustViewOptionsForIndex().Friedemann Kleint2014-05-071-9/+2
| | | | | | | | | | Determine the visual index by looking up the column of the QModelIndex in the logicalIndices array instead of looping. Task-number: QTBUG-37813 Change-Id: I5c3c73c67537877b03cdc2c36a52041d99f7f49d Reviewed-by: David Faure <david.faure@kdab.com> (cherry picked from qtbase/85aef2dd4b059d2ba9cba4605d9fef87f3e2c4fc)
* Fix MacOS build with SDK 10.7, XCode 4.3 and aboveWolfgang Bremer2014-05-071-2/+4
| | | | | | | | | | | | A hardcoded path condition failed and thus the dependency CoreWLAN was not added. This caused missing symbols. This patch is not necessary for Qt5 as only SDKs 10.6+ are supported. Task-number: QTBUG-24361 Change-Id: I273a2be8d2bd7c72e8d7a1eed7c3e62a380e237a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Don't crash on broken GIF imagesLars Knoll2014-05-061-0/+7
| | | | | | | | | | | | | | | | Broken GIF images could set invalid width and height values inside the image, leading to Qt creating a null QImage for it. In that case we need to abort decoding the image and return an error. Initial patch by Rich Moore. Backport of Id82a4036f478bd6e49c402d6598f57e7e5bb5e1e from Qt 5 Task-number: QTBUG-38367 Change-Id: I0680740018aaa8356d267b7af3f01fac3697312a Security-advisory: CVE-2014-0190 Reviewed-by: Richard J. Moore <rich@kde.org>
* QMdiArea: Ignore events of other instances in the event filter.Friedemann Kleint2014-05-061-0/+3
| | | | | | | | | | | | This caused for example the variable QMdiAreaPrivate::isSubWindowsTiled being cleared from another instance, which resulted in odd resizing behavior. Task-number: QTBUG-31448 Change-Id: I880f7e415d6654e52499df1bfaf99f2c55d86320 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com> (cherry picked from qtbase/9e2c4bc67f30eb1e8d776afe3a092d5994aaab38)
* Don't use QAbstractButton::pixmap() as this will always return 0.Andy Shaw2014-05-061-2/+2
| | | | | | | | | Instead of using pixmap() we use icon() instead which is what the extension menu is after in this case. Task-number: QTBUG-38301 Change-Id: I2c238b50b0fcf04318100d2d6d39f563ef3eff5b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Use WINVER instead of _MSC_VER for version check in qeventdispatcher_win.cpp.Joerg Bornemann2014-05-061-2/+2
| | | | | | | | Task-number: QTBUG-38604 Change-Id: Idb8a8219e09c6aa1a1b24e45b9da640c8d4b7161 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> (cherry picked from qtbase/e30ae1268f8e224369ff7841b90184c8694a86e7) Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix - psql driver must format qdatetime using isoCristian Tarsoaga2014-05-051-2/+2
| | | | | | | | QDatetTime must be formatted as ISO8601 specifies, date/month must be padded with 0 until width is 2 Task-number:QTBUG-33389 Change-Id: I2db10e4b0f55a2666b2a12d7d8fcd03f13b96875 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* fix include of private headerMark Brand2014-05-031-1/+1
| | | | | Change-Id: I0554933de2536231d7d416d8df5b96eaa459fc51 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Refactor OS X bundle detection for QFileInfoSamuel Gaist2014-05-022-14/+66
| | | | | | | | | | | | | | | | | | | | | CFBundleGetPackageInfoInDirectory originally used tests for the presence of information that are not mandatory in a bundle. Following Apple's documentation, the new approach is to use Uniform Type Identifier which queries the OS directly to check whether the extension conforms to kUTTypeBundle. That includes e.g. applications, frameworks etc. Then it tries to determine if the bundle can be opened with an application that is not Finder. Last thing, it checks whether the package bit is set. (cherry picked from qtbase/72d60ea08c14037250459a5424ffee7a36b909b1) (cherry picked from qtbase/bcfc68f9cd00982decd7ceb312966caf6b1ca05e) (cherry picked from qtbase/afacf694d5a6f34b88989e76971d70d700ce4949) Task-number: QTBUG-31884 Change-Id: I4ce3d8b90d116960b2044d3fafe3f745f6141416 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Vista Style: More menu item pixel fixes for QtQuick ControlsGabriel de Dietrich2014-04-221-2/+2
| | | | | | | | | | | | Includes a one-pixel fix for widgets, where the menu item text would be one pixel too far away from the vertical gutter. Task-number: QTBUG-37451 Task-number: QTBUG-38376 Change-Id: I2539233814a427c5bed66a5c07584717eb3df418 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> (cherry picked from qtbase/9cd2dac348f45c4b93f74f8ebe20d7528821f003)
* Fix building of JSC with libc++.Raphael Kubo da Costa2014-04-221-6/+0
| | | | | | | | | | Follow-up to 0de22e8 and 427d50d: the former was not just a cleanup commit, and part of the changes reverted in the latter actually broke the build with libc++ again: clang defines __GNUC__ for compatibility with GCC, but if libc++ is used ext/atomicity.h does not exist. Change-Id: Id86646d38b7bc62dbe0731f8f32efb2353335210 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* QNX: Fix QDir::entryInfoList()Bernd Weimer2014-04-223-11/+12
| | | | | | | | | | | | | | If D_FLAG_FILTER is set, duplicate name entries are filtered out, so this flag has to be set along with D_FLAG_STAT in the call to dircntl. Also releaved dependencies between defines__EXT_QNX__READDIR_R, __EXT_QNX__READDIR64_R and _POSIX_THREAD_SAFE_FUNCTIONS Back-ported from qtbase: aee59f06e0017e225363d4207d3d96c2b30698e1 Change-Id: Ifa2148cc49544076fcfe8fb88e2a0dfe2404959e Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Fix compilation using MinGW 64 due to missing __cpuidAllen Winter2014-04-181-7/+7
| | | | | | | | | | | | Compile fails on Windows 64 using MinGW with the error message: '__cpuid' was not declared in this scope. fix by moving the Q_CC_GNU block above the WIN64 block as suggested by Thiago in the QTBUG-34022 comments. Task-number: QTBUG-34022 Change-Id: Iced4ac0b64f8ba986e49543ff3793ae8c0c33d14 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QDbus: Fix (!a == b) comparisonDavid Faure2014-04-181-1/+1
| | | | | | | | | ! binds to a, and that is wrong here. (cherry picked from qtbase/4b7cd57719a637189696d673b014ae785df669bf) Change-Id: I75542a0c27f39fb6e684dedd9925a1f3748d4919 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix compilation of QtWebKit with MSVC 2013Ashish Kulkarni2014-04-171-2/+2
| | | | | | | | | | Starting with MSVC 2013, more functions are provided. Task-number: QTBUG-34705 Change-Id: I85e35a2486e0bd556f5f16e5911cca5c364273ed (adapted from commit qtscript/24d678ce9c3996f46d1069c2b1193e7ec1083fc8) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix compilation of QtWebKit with MSVC 2012/2013Ashish Kulkarni2014-04-171-0/+16
| | | | | | | | | | For some reason, MSVC 2012/2013 is no longer able to infer the need for both a call to a constructor and a cast of its parameter so we have to give a hint for at least one of these two operations. Task-number: QTBUG-31882 Change-Id: I42b54313ec4f6a83cde28326534c59b93ab3f615 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* OS X: Make Qt application react on applicationShouldHandleReopenSamuel Gaist2014-04-171-0/+13
| | | | | | | | | | | | | | | Currently a click on e.g. the dock icon is not propagated to the application so if for example the main widget is hidden, it doesn't come back. This patch fixes it Task-number: QTBUG-10899 [ChangeLog][QtGui][OS X] Fixes a bug where clicking on the dock icon would not be propagated to the application Change-Id: Ia02ca23ed0dafbd337d1d7d9bc5f7efe3843b512 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix crash when deleting top level windows embedded into QGraphicsProxyWidget.Friedemann Kleint2014-04-151-0/+4
| | | | | | | | | | | Clear proxyWidget pointer in slot QGraphicsProxyWidgetPrivate::_q_removeWidgetSlot(). Task-number: QTBUG-29684 Task-number: QTBUG-33213 Change-Id: Ibdbd52aa810ca908e3d98daa00954345e7a93a48 Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name> (cherry picked from qtbase/ff2dbe609ef4482d66d1ecd135b4f53f6aff7e60)
* Fix crash when trying to place toolbar into zero-height window.Friedemann Kleint2014-04-103-20/+32
| | | | | | | | | | Change QToolBarAreaLayout::item() to return a pointer and check return values in plug(). Task-number: QTBUG-37183 Change-Id: I7029eb9739cbe603460e87d3e5493f116bdb3a89 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> (cherry picked from qtbase/e38ad9455099a83e2a8619f19ca949bc64ae6f82)
* Fix access of tmpStorage in QODBCResult::exec().Friedemann Kleint2014-04-071-27/+22
| | | | | | | | | | | | | Instead of using a list and appending / popping of elements, use a vector of constant size and access via index to avoid bookkeeping errors. Task-number: QTBUG-37831 Change-Id: Icb5a182626c63e693b04daaf7a2f70997d9aeae1 Reviewed-by: Mark Brand <mabrand@mabrand.nl> (cherry picked from qtbase/d5ff16bc8ebf0f17fae3a28f08018db26567e81c) Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Avoid out of bounds memory reads when scaling imagesv4.8.6Lars Knoll2014-04-036-27/+45
| | | | | | | | | | | | | | | | | | The calculation of the width/height required for the scaling algorithm was prone to floating point rounding issues, where the lower value got rounded down, the higher one rounded up. This could lead to a situation where we iterated over one more line/pixel in the line than we have in the source image. Correct this by passing the dimension of the source image into the function and bounds checking the values before iterating. Backport of If44b2235a479224660d508a0504fec40d724763a from Qt 5 Task-number: QTBUG-35927 Change-Id: If145ee715a143b889538243f45227d8d78a0050f Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Pass events to QGestureManager from the main (GUI) thread only.Friedemann Kleint2014-03-281-9/+12
| | | | | | | | Task-number: QTBUG-20946 Change-Id: I964452c1e97bd3d3a521e33abeb2f7d8cdbc89a9 Reviewed-by: Andy Shaw <andy.shaw@digia.com> (cherry picked from qtbase/9b28ab3f38e21f2e1498dea5dd761d22d72fb1ac)
* printsupport: set duplex setting correctly to CUPS printerTeemu Katajisto2014-03-281-14/+14
| | | | | | | | | | If CUPS printer default is not DuplexNone then setting duplex to None for printer did not have any effect on duplex setting. (backported from qtbase/385e584926f2957d6e9ec4c2c4e89b37a5e0c80c) Change-Id: Ia72f599a9e5fa511b3214c6b8016e21f40409b86 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* QPrintDialog OSX: don't crash if ApplicationModal and no parentShawn Rutledge2014-03-281-1/+3
| | | | | | | | | | Task-number: QTBUG-32464 (backported from qtbase/03855decfcb4e05817424843564a4b66636bb347) Change-Id: I12892798419b2efcf404f972930562d50d045ea3 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* QPrintDialog: document the modality on OS X and WindowsShawn Rutledge2014-03-281-0/+4
| | | | | | | | | | | | You can't programmatically close the dialog because it's modal. Task-number: QTBUG-32464 (backported from qtbase/bd602a2dc4bc9491f80919b09a8990edb6fbee97) Change-Id: Ib7573b347b3f10914e60af05f95ed9f5763eadd8 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Updated year in copyright headerKai Koehne2014-03-264379-4391/+4391
| | | | | | | | | | | | | | | | | | find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g' Manually patched files: demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp src/3rdparty/s60/eiksoftkeyimage.h tools/qdoc3/test/qt-project.qdocconf tests/auto/qsharedpointer/nontracked.h tests/auto/qsharedpointer/nontracked.cpp Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add AArch64 support to qfilesystemwatcher_inotify.cppLisandro Damián Nicanor Pérez Meyer2014-03-241-0/+9
| | | | | | | | | | | | Based on a patch by Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>, licensed under CC0 (aka Public Domain) or BSD license. Backported from qtbase, commit d5dcd6d16647e4ecac239fa26ade5963f0e3f933 Change-Id: I0d01a129c039250ac33dc5f984baec9595786211 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QPushButton: draw label using the stylesheet's font.Mitch Curtis2014-03-211-0/+8
| | | | | | | | | | | | The RenderRule for the stylesheet has the correct font information, it just wasn't being set on the painter that draws the label. This is a backport of the Qt 5 commit: 9ad768fd1999780df18551151b9d9fa9c354131c. Task-number: QTBUG-8990 Change-Id: I4857d6e17b62980782ca7bfdfd0a571a9950f635 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* QMenu: Sloppy menu selection should allow hovering separatorsGabriel de Dietrich2014-03-201-0/+1
| | | | | | | | | | | | | | | Setting the current action to 0 clears the sloppy region and closes the submenu if we hover a separator on the way to the submenu popup. Now, we choose not to while the sloppy delay timer is running. This is a backport of I9d1b1358fe64c259dc47f35db8fc8f2b19a73153 from qt/qtbase. Task-number: QTBUG-20094 Change-Id: If4b3cff05a9bcb41cee3e49490d4cc5fc3595821 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QMenu: Enable sloppy submenu mouse navigationGabriel de Dietrich2014-03-204-7/+16
| | | | | | | | | | | | | | | Since we're in the 21st century, we set QCommonStyle to return true to the SH_Menu_SloppySubMenus style hint. This unlocks all the logic already available in QMenu. This is a backport of I134c87e348d98d1f46055e0bfef2b4a4a3d2993a from qt/qtbase and includes some previous enhancements. Task-number: QTBUG-20094 [ChangeLog][QtWidgets][QMenu] Enable sloppy submenu mouse navigation Change-Id: If4141a3d849123850e40af92ac5aede9ed767bdf Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QMenuPrivate: Make sloppyDelayTimer non-staticGabriel de Dietrich2014-03-202-7/+6
| | | | | | | | | | | | | | | Keeping the timer static would trigger warnings when enabling SH_Menu_SloppySubMenus in QCommonStyle in a forthcoming patch. This would happen if we opened a second level submenu quickly enough and get the mouse event handler to reset the timer its parent menu started. This is a backport of Ia768603b40b219f87138c60a595c65ef408761ae from qt/qtbase. Change-Id: Ia7e9a94b3445d9362a60a36d5e4dda878ab0f7a5 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix QByteArray memory corruption in QIBaseDriver::open().Friedemann Kleint2014-03-191-20/+15
| | | | | | | | | | | Rewrite code to use QByteArray::reserve(), QByteArray::append() instead of memcpy(). Task-number: QTBUG-37508 Change-Id: I16ead153f33fa5a34bc01ee27ae4cd1b8993b65e Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl> (cherry picked from qtbase/0d50efeae9829336ffb7e47692cfdc649e10ee70)
* BlackBerry: Improve platform specific documentationBernd Weimer2014-03-182-2/+20
| | | | | | | | | | Updated BlackBerry specific documentation around QSettings to make the differences more obvious for developers. Back-ported from qtbase: 563342d7ef7e490239cba6d335849ebb91983b9a Change-Id: I603053cecff97f3222257cbba8d72d2ec2666d6f Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* QWindowsXP/VistaStyle: Fix detection of item view delegate line edits.Friedemann Kleint2014-03-173-15/+17
| | | | | | | | | | | | | | The old code tried to check the 2nd parent for inheritance from QAbstractItemView. This also triggers for line edits on a QDialog parented on the item view. Introduce convenience function that checks for top levels in the chain. Task-number: QTBUG-37504 Change-Id: I932f8efdb4764e9b1eea84c802bf7e8718338e1d Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> (cherry picked from qtbase/176342e70a1ba7864a5b5dac14d12d4091ef5bd9)
* network: fix doc typo in QNetworkConfigurationManagerPeter Hartmann2014-03-131-1/+1
| | | | | | | (cherry picked from commit 32794abe722161e1224920865c77c37d74ab977b) Change-Id: Icc66ac3fef52508abda85bafe225fc93f4eb9d4c Reviewed-by: Richard J. Moore <rich@kde.org>
* Remove -fuse-ld=gold from webkit's LFLAGSNiels Ole Salscheider2014-03-131-7/+0
| | | | | | | | | | | This flag is not supported by upstream gcc. Thus the build might fail if the gold linker is found. This fixes https://bugs.webkit.org/show_bug.cgi?id=89312. Change-Id: I931081fccf64a43b32f2aaf2c3ad377391fdad4c Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Windows: Restore maximized/full screen widgets to correct screen.Friedemann Kleint2014-03-131-4/+17
| | | | | | | | | | | | | | | | | | | | | Partially revert 54865d47cfd859a0e84ba8e1bbff3b56c93d4e0d and bring back parts from abba37cd0eff959edf2d011842cbf2b36cce8467 which failed some tests on other platforms and never made it in. Avoid setting a geometry on maximized windows since that leaves them in a broken state. Instead, if there is a need to restore maximized windows to a different screen, clear the maximized flag before applying the geometry. [ChangeLog][QWidget][Windows] QWidget::restoreGeometry() now restores maximized/full screen widgets to the correct screen. Task-number: QTBUG-21371 Task-number: QTBUG-4397 Change-Id: Ibd5b736e921f20d4b7365c06c6f9c5dd4469c781 Reviewed-by: Andy Shaw <andy.shaw@digia.com> (cherry picked from qtbase/ae4243df1e53b0aaeada708f6fa7979a0f0d216a)
* Fix a crash when reparenting widgets on Windows.Friedemann Kleint2014-03-131-4/+6
| | | | | | | | | | Introduced by a9edbeddafe5d8866192de44f4028d07bd93013a . Task-number: QTBUG-37346 Task-number: QTBUG-30276 Change-Id: I81e218839db50a88a8b149dd5481bfd0835284da Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Fix recursive calling of QScriptProgramLars Knoll2014-03-132-1/+3
| | | | | | | | | | | | | | The first time a QScriptProgram is evaluated, it gets compiled and then executed. If the execution would somehow trigger another evaluation of the script program, it would run into the compile stage again (even though it already was compiled), and then trigger and assertion in debug mode (or leak memory in release builds). Backport of 08d9ef715265d33f4cf04693b0787fd75994dc42 from Qt 5. Task-number: QTBUG-37317 Change-Id: I83e7efd5f238d021e200258826e2e4a9520c3a7d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* do not use fileno calls in forked childJoerg Bornemann2014-03-131-4/+4
| | | | | | | | | | | | | | | | | | | | | This fixes an issue that causes QProcess::start to silently fail on OS X 10.9. Apparently, fileno(stdout) locks the handle on OS X 10.9. It may happen that the parent process fflush()s stdout while the child has just been forked. The stdout lock of the parent is never released in the child and fileno(stdout) therefore locks forever. According to the fork documentation on opengroup.org one may only call async-signal-safe functions between fork and exec in the child. The fileno() function does not appear in the list of async-signal-safe functions. Also, fileno(stdout) and friends can be easily replaced by the standard constants STDOUT_FILENO etc. Done-with: Fawzi Mohamed <fawzi.mohamed@digia.com> Task-number: QTBUG-37306 Change-Id: I2b1f5f47cc48a1ad020fb0493a955d2bc27aeb47 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from qtbase/b2216bbe06b8be2bef6d8bc2ffff1337f6d23358)
* Add AArch64 detection support to JavaScriptCore.Dmitry Shachnev2014-03-131-1/+9
| | | | | | | | | Cherry-picked from qtscript commit 2e049836ee16f4aedbe7ccc3335fc5. Change-Id: I8d9fdeceb62f4de4eb9bd74ae45bb33a641ef5cc Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Doc: Update, and reduce duplication of, QThread-related infoSze Howe Koh2014-03-131-14/+15
| | | | | | | | | | | | | | | | | | | | | | Added/Changed: - Move content from the Thread Basics overview to the QThread class ref - Rephrase bits for clarity - Use more links Removed: - (threads-basics.qdoc) Warning against moveToThread(this): This usage came about when people tried to add slots to a QThread subclass. This patch adds a warning against the root cause. - (threads-basics.qdoc) The strategy for managing member variables: Sounds error-prone. Pushing results through signals is safer. - (qthread.cpp) The note about GUI classes: Irrelevant to QThread, and it's already mentioned elsewhere. This is a cherry-pick from a9d5627e6a7b82 in qtbase.git. Change-Id: I491f64f998050daf0251abb2126bc9f7a198c17d Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Discuss the concept of thread affinity in more detailSze Howe Koh2014-03-131-7/+35
| | | | | | | | | | | | | | | | | - Create a section dedicated to this concept, which is fundamental to signal/event handling - Move relevant content from the very broad "Thread Basics" page to the QObject class ref - Flesh out existing content, including distinguishing signals from events - Address the common misconception that "member" = "child"; this has been encountered several times in the Qt Project forums This is a cherry-pick from 3b45dfe6e6ff6c0626b in qtbase.git Change-Id: If3b65f3da4e1ca414c7175c4e22bcdef38f45442 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Prevent spurious SSL errors from local certificates.Richard J. Moore2014-03-131-3/+0
| | | | | | | | | | | | | | | | | | | Qt since approximately 4.4 has set the verify callback on both the SSL store and the SSL context. Only the latter is actually needed. This is normally not a problem, but openssl prior to 1.0.2 uses the verify code to find the intermediate certificates for any local certificate that has been set which can lead to verification errors for the local certificate to be emitted. Backport of 7c8131763de9e70ca56f16635716e7e00559b5d1 Task-number: QTBUG-33228 Task-number: QTBUG-7200 Task-number: QTBUG-24234 Change-Id: I65db8b658df9ff86095381c7b87d690258f03c3a Reviewed-by: Daniel Molkentin <daniel@molkentin.de> Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* Fix Mac Bearer when machine has no wifiFrederik Gladhorn2014-03-132-0/+4
| | | | | | | | | | | This manifested itself for some continuous integration machine, all regular macs have wireless. In case there is no wifi, we would never emit updateCompleted(). Change-Id: I81dce65cdbb0091944c4e79fdb5f2b7f5f70de88 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* Fix building of WebKit's JSC for earlier versions of gcc on MacAndy Shaw2014-03-131-0/+14
| | | | | | | | | | Since building for Carbon typically uses older versions of gcc on older versions of Mac, then we need to revert e3c44790065894f4e7f98ab097fce22c5bcbbd0a partially in order to fix this. Since the original code was just a cleanup then this is safe to do so. Change-Id: Ic662841f53660b763af2bc71cb9b4684fe614063 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Qt 3 Support: Prevent double deletion of QObjectPrivate::threadData in ↵Friedemann Kleint2014-02-251-0/+1
| | | | | | | | | QSettings. Task-number: QTBUG-36908 Change-Id: I8f9f86f20bd8bb479c2637f6c276e4e2593ecef9 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Fix building of JSC for earlier versions of gcc on MacAndy Shaw2014-02-251-0/+14
| | | | | | | | | | Since building for Carbon typically uses older versions of gcc on older versions of Mac, then we need to revert 0de22e80ac645afc3793419300d6271d95809196 partially in order to fix this. Since the original code was just a cleanup then this is safe to do so. Change-Id: I5dd8fe99704ffac66ac3384b62849fa8162ca82d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Mac: Fix file dialog filters when filter doesn't start with '*'Eike Ziller2014-02-131-1/+2
| | | | | | | Task-number: QTBUG-17326 Change-Id: Ie32f2807e64aa9c90b2e7d75adcd2aef67649225 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
generated by cgit v0.12 at 2024-07-20 12:30:55 (GMT)