summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QSslCertificate: report fraudulent certificates as invalidPeter Hartmann2011-06-162-4/+31
| | | | | | | | | | | There are some fraudulent certificates in the wild that are not valid; this patch introduces a blacklist of serial numbers of those certificates. Reviewed-by: Richard J. Moore Reviewed-by: Markus Goetz Task-number: QTBUG-18338 (cherry picked from commit 04e074e8d7c097295505e63565abdc7ca2b49f7b)
* Fix handling of SSL certificates with wildcard domain namesRichard J. Moore2011-06-092-4/+39
| | | | | | | Merge-request: 731 Task-number: QTBUG-4455 Reviewed-by: Peter Hartmann (cherry picked from commit 5f6018564668d368f75e431c4cdac88d7421cff0)
* Fix Qt applications freezing until mouse/keyboard events occur.Bradley T. Hughes2011-06-091-4/+9
| | | | | | | | | | | | While the qt_GetMessageHook() is executing, GetQueueStatus() reports that there are timer messages in the queue, but these are never actually seen by the hook. Calling PeekMessage() will never return these messages (which is what we really want to know), so don't use GetQueueStatus() with QS_TIMER. Task-number: QTBUG-12721 Reviewed-by: denis Reviewed-by: joao
* Layout direction change by key should change alignment of QLineEditEskil Abrahamsen Blomfeldt2011-06-091-1/+4
| | | | | | | | | | | | | | When QLineControl was split out of QLineEdit, a regression was introduced. When the layout direction was altered by a key press, the layout direction of the QLineControl would be set, but not the QLineEdit. This would in turn mean that QLineEdit would use the wrong layout direction for its visual alignment. Patch is a small hack to read back the layout direction from the control after it has been set. Task-number: QTBUG-11204 Reviewed-by: Trond (cherry picked from commit d198186cdb18bbb9428ca51e8771cc4fd9563452)
* Fix QMutex can deadlock when calling tryLockOlivier Goffart2011-06-091-1/+4
| | | | | | | | | | | | | | in the unix code, if the QMutexPrivate::wait() with a timeout expires in the same moment that the mutex is released, wakeup would be set, but would be then ignored. (reset to false quickly after) If we waken up between the timeout and the re-aquisition of the internal mutex, we consider that the mutex has been locked. Reviewed-by: brad Task-number: QTBUG-16115 (cherry picked from commit 7987d4cfd3ce86c20a55b5661a5221f12246b27e)
* Fix crash in indeterminate progressbars on windowsJens Bache-Wiig2011-06-092-3/+6
| | | | | | | | | | Note that this is a surgical fix for 4.7 only. In 4.8 we will add these checks at the top of the styling functions or in the widgets instead. Task-number:QTBUG-15227 Reviewed-by:gabi (cherry picked from commit 8a3c4c8283e4762744a29262ce507713565c1c0c)
* qgrayraster: Speed up rendering of small cubic splines.Andreas Kling2011-06-091-20/+16
| | | | | | | | | | Based on these upstream freetype2 commits: 7fb3ef64a24489189113f693696eaf935f500c3f e419f48b40a746465a6c8e1d446b407b8677bfed Reviewed-by: Samuel Rødal (cherry picked from commit a9c0fbd5e946ae6e90b6db6dd4aea64c824a4066)
* Fix OpenVG painting artifacts after restoreState().Jason Barron2011-06-091-0/+1
| | | | | | | | | | | When the state is restored and the 'dirty' flag indicates that the clip state has changed, the paint engine needs to set 'scissorDirty' flag to true so that updateScissor() applies the restored clip region to the scissor rects. Task-number: QTBUG-14907 Reviewed-by: Jani Hautakangas (cherry picked from commit 99ee75f6df588103f83fc807e6ee686971cc18df)
* Disable the unified toolbar before enteringFabien Freling2011-06-093-2/+37
| | | | | | | | | | | fullscreen on Mac OS X. We are just enforcing what the documentation recommended. Task-number: QTBUG-13772 Reviewed-by: Samuel (cherry picked from commit 5fd505cac71e97cf181c0d05867a77e640814fc6)
* Fixed a buffer overrun when pasting large data from non-Qt appsDenis Dzyubenko2011-06-094-16/+12
| | | | | | | | | | | | | | | When we receive a COMPOUND_TEXT data and convert it to multi-byte, if the new length is less than the original buffer, we resize the buffer, but then we need to make sure we reset the buffer_offset variable, which is returned as a "size" of the buffer to a caller. The conversion to COMPOUND_TEXT format was totally wrong, we were using the wrong length of the input text, so the converted string was truncated. Task-number: QTBUG-8644 Reviewed-by: Bradley T. Hughes (cherry picked from commit 4b81cb847647450f4bad8a0d9a278d43ebdfecc6)
* Fix copying large data to non-Qt applicationsDenis Dzyubenko2011-06-091-1/+1
| | | | | | | | | | | | | | | In send_selection when we decide to use INCR properties we set the given property value to be INCR atom, however we were also sending SelectionNotify event containing the name of the property that the client should watch as INCR, which is wrong, we should send the original property that we were asked to use instead. This fixes copying large junks of data from Qt application, for example copying text (>200k) to gedit or images to gimp. Task-number: QTBUG-8644 Reviewed-by: Bradley T. Hughes (cherry picked from commit 62ee836fafe515c03b0be716585f8c2354e188f7)
* Fix QScriptEngine::abortEvaluation.Jedrzej Nowacki2011-06-091-2/+5
| | | | | | | | | This patch reduce time in which QScriptEngine would abort an script executing multiple long-running native functions. Task-number: QTBUG-9433 Reviewed-by: Olivier Goffart (cherry picked from commit eb407209bb9f2c06684fd1299169cd3b8ab4b58d)
* Fixed crash when using Qt::WA_DeleteOnClose on a QPrintDialog on Mac.Trond Kjernåsen2011-06-091-9/+0
| | | | | | | | | | The Qt::WA_DeleteOnClose bug was fixed some time ago, while this workaround was "forgotten" in the QPrintDialog code. It actually causes a crash and is no longer necessary. Task-number: QTBUG-11430 Reviewed-by: Prasanth (cherry picked from commit 165dbe2615bf4b908e6bc84bb8963ca72fe5f866)
* Fixed floating point overflow issues in QRasterizer::rasterizeLineSamuel Rødal2011-06-091-60/+79
| | | | | | | | | | | | | | | | | | Change 7c673a4cf64ba04 introduced some autotest failures in the fpe_steepSlopes test in QPainter. Since the other rasterizers all deal in a 26.6 fixed point coordinate space we should snap the line vertices to this to prevent floating point overflows due to very steep slopes. This also necessitates keeping track of four different slope / inverse slope increments for each of the four edges. This also fixes a previously QEXPECT_FAIL'ed test case. Task-number: QTBUG-13429 Reviewed-by: Trond (cherry picked from commit 93199a5b7082fd484b7f21ad4825d71693ecead2)
* Fixed scaled point drawing with square cap in raster paint engine.Samuel Rødal2011-06-091-24/+17
| | | | | | | | | | | | With a large pen width and a small scale, due to the hacky way we draw points (stroking a line from (x, y) to (x + tiny_amount, y)), we some times end up snapping these two points to the same in rasterizeLine(). If we instead apply the SquareCap before we do clipping / snapping we don't get this problem. Task-number: QTBUG-13429 Reviewed-by: Trond (cherry picked from commit 7c673a4cf64ba043bb27f90287517bdcdd7a21db)
* Fixes bezier curves not being drawn when it is a line.Yoann Lopes2011-06-091-41/+0
| | | | | | | | Some old work-around code is no longer needed... Task-number: QTBUG-13721 Reviewed-by: Samuel (cherry picked from commit 9035b78ef8b8ebfdd7d43fc0b9c3071253eb0d56)
* Fixed color of cosmetic pens when printing under Windows.Trond Kjernåsen2011-06-091-1/+1
| | | | | | | | When the PS_COSMETIC style is used, the pen width has to be 1. Task-number: QTBUG-13065 Reviewed-by: Samuel (cherry picked from commit 6ecb1be99ff951f35d7b391d6ffb033da696ca74)
* Prevent crash in QGLGlyphCache due to dangling context references.Samuel Rødal2011-06-091-3/+5
| | | | | | | | | We need to clear the context from the cache when it's destroyed even if it doesn't belong to a widget. Task-number: QTBUG-13622 Reviewed-by: Trond (cherry picked from commit cb764eaf91e3a8ef30b280671d5c991ec926d14c)
* QSslSocket: Improve error handlingPeter Hartmann2011-06-091-1/+13
| | | | | | | Reviewed-by: Markus Goetz Task-number: QT-3567 (cherry picked from commit c25c7c9bdfade6b906f37ac8bad44f6f0de57597) (cherry picked from commit 151983bd827c8a05b8798560ade4d911a04156c3)
* Minor performance improvement to QGraphicsItem::update.Bjørn Erik Nilsen2011-06-091-3/+0
| | | | | | | | | Reported by other teams in Nokia. Avoid calling discardUpdateRequest() twice, first in update() and then in markDirty(). No-brainer. Task-number: QTBUG-10817 Reviewed-by: Trustme (cherry picked from commit 72a1709cbe216220722750c743641bf5ba8a8da9)
* Fix some missing proxy calles for CleanLooksJens Bache-Wiig2011-06-091-5/+5
| | | | | | | These were simply left out as an oversight. Task-number: QTBUG-13318 (cherry picked from commit 1f5d88dd327be635966ed9e3811c8803a163b2a4)
* QSslConfiguration: fix crash when accessing null pointerPeter Hartmann2011-06-091-0/+5
| | | | | | | | | We were accessing the d-pointer of a QSslConfiguration which is initialized lazily. Reviewed-by: Markus Goetz Task-number: QTBUG-13265 (cherry picked from commit d686a95ed54b19336affc14c9222de54c9af0e72)
* Fix the broken unicode detection of ODBC driver.Charles Yin2011-06-091-1/+1
| | | | | | | | the unicode flag is entirely overrided by mistake. Task-number:QTBUG-13109 Reviewed-by:Michael Goddard (cherry picked from commit 67ddb9cca2b638b1cf71eb98e906260b83a38677)
* QFileDialog::HideNameFilterDetails breaks Cocoa QFileDIalog filterRichard Moe Gustavsen2011-06-091-8/+17
| | | | | | | | | | | | | Using namefilters in the non-native file dialog is a bit broken by design, since it don't store the whole selected name filter, but only the filter with details stripped off (if this is specified). And it stores this data in gui widgets. And the native file dialog also suffers from this. At least this patch will pick the first matching name filter (with details) given a details-stripped version. Task-number: QTBUG-12870 Reviewed-by: cduclos (cherry picked from commit 0e4a9ab0f60faff3bde86cb7f08250161c18103e)
* Crash in QX11PaintEngine::drawPixmapCarlos Manuel Duclos Vergara2011-06-091-0/+2
| | | | | | | | | | | We receive a pixmap as a const reference and then we convert it to an X11 pixmap. This conversion could fail for many reasons, however we were not looking at the result of this conversion. This patch was contributed by Christoph Feck from KDE. Task-number: QTBUG-12826 Reviewed-by: Samuel (cherry picked from commit 8e7fb343372acd0bc5fe04db7a5c5542541d4538)
* QXmlStreamReader: avoid unnecessary detachingPeter Hartmann2011-06-091-1/+1
| | | | | | Reviewed-by: Markus Goetz Task-number: QTBUG-12259 (cherry picked from commit c7fcd56bd3e150e57230ea1445bf4286b3f3fabe)
* QSslCertificate: support expiration dates > 2049Peter Hartmann2011-06-091-50/+71
| | | | | | | | | | X509 has two time formats: UTC, where the year is in two-digit format, and generalized time with four-digit years. This patch allows dates specified generalized time. Reviewed-by: Thiago Macieira Task-number: QTBUG-12489 (cherry picked from commit a77dbcdbb7022cc754ba87aea9a4fc471d1e4495)
* Fix QString::arg: When specifying %L1, the group separator would be added ↵Olivier Goffart2011-06-091-5/+8
| | | | | | | | even if the local specify QLocale::OmitGroupSeparator Task-number: QTBUG-9281 Reviewed-by: Denis (cherry picked from commit 720f4ca0ec3b42a101ac24b2cf74cdc87d29eac9)
* Fixed potential infinite loop in QFileSystemWatcher on Mac.Denis Dzyubenko2011-06-091-2/+3
| | | | | | | | | The patch provided by the customer just jumps to reading the next event fom the kqueue when an unexpected condition happens. Task-number: QTBUG-12533 Reviewed-by: Bradley T. Hughes (cherry picked from commit b7256b1f8c9bb43c5234d24453aaa8b1c079cf06)
* Fix crash when all the items in a QListView are hiddenGabriel de Dietrich2011-06-091-1/+6
| | | | | | | | | | | | | | | | | | | Calling QIconModeViewBase::initDynamicLayout() on the second and successive segments would return QPoint(-1,-1), resulting in a totally empty area rectangle for all the items while in QIconModeViewBase::doDynamicLayout(). This rectangle is used to initialize the BSP tree, and produces an arithmetic exception when empty. Furthermore, a rendering bug was also apparent when displaying the first item of a segment while the last item of the previous segment was hidden. Auto-tests included. Reviewed-by: Olivier Task-number: QTBUG-12308 (cherry picked from commit 3c7e7992461b1fef37ada68244f1b5b891015bda)
* Fixed QVideoSurfaceFormat::isValid()Dmytro Poplavskiy2011-06-091-1/+1
| | | | | | | | Trivial fix, valid formats have pixel format != Invalid, not ==. Task-number: QTBUG-12337 Reviewed-by: Andrew den Exter (cherry picked from commit 51cf737151c1c446a9ce77832774202b6bdb4ba2)
* Fix an Assert in QTextTablePierre Rossi2011-06-091-4/+24
| | | | | | | | | | The problem was caused by the fragment id being inserted in front of a cell spanning over several rows instead of the next logical cell (or fragment_end) in the cells structure. Task-number: QTBUG-11282 Reviewed-by: Simon Hausmann (cherry picked from commit d3a6f124dde7732311ad9312ebf41997712fc6bb)
* Fix a crash when recursing into QSharedPointer from QSharedPointer::clear()Thiago Macieira2011-06-091-14/+17
| | | | | | | | | | | | | | We used to delete the tracked object before the new tracking was properly set up in QSharedPointer. That means if the tracked object's destructor or deletion function recursed into the QSharedPointer, it would find itself in an inconsistent state. So instead finish the setup and only then call out to user code. That ensures the internal state is always valid. Task-number: QTBUG-11730 Reviewed-by: ossi (cherry picked from commit 943d63e45ad09f75daa7d2f3dcc17bb28fda1766)
* Initalize the nativeDialogInUse variableAndy Shaw2011-06-091-0/+1
| | | | | | | | | | When the variable was not initalized it would randomly show a native font dialog or a non native one if the DontUseNativeDialogs flag was set. Task-number: QTBUG-12042 Reviewed-by: cduclos (cherry picked from commit c48eb6d5d0a299449330dea8a6a59514942c8781)
* Don't try and use QFactoryLoader when relevant features are turned off.Justin McPherson2011-06-091-4/+15
| | | | | | Task-number: QTBUG-11900 Reviewed-by: Andrew den Exter (cherry picked from commit 2de46daf6568c85d976a1e784c0bafbea89adb3a)
* Fixed size hint for combo box on windowsJens Bache-Wiig2011-06-092-25/+4
| | | | | | | | | | | When you use larger fonts or DPI on windows, the combobox can calculate a size hint that results of text eliding on items. This fix removes some duplicate code in Vista style and adds a dpi dependant size hint for XP style. Task-number: QTBUG-7552 Reviewed-by: richard (cherry picked from commit 8577353b2a5155600e672955e7c6a61e9e9519ca)
* Segmentation Fault in QAudioOutputPrivate::freeBlocks() caused by wrongKurt Korbatits2011-06-092-2/+2
| | | | | | | | pointer increment Task-number:QTBUG-11883 Reviewed-by:Andrew den Exter (cherry picked from commit 6d5e561be6f013f7cb5c77e15ee6b7640cad7563)
* Crash while changing the windows flags from a Qt::Drawer window on CocoaPrasanth Ullattil2011-06-091-3/+5
| | | | | | | | | The crash was caused while checking the visibility of the toolbar inside a native cocoa window. There is no toolbar for a drawer window. Task-number: QTBUG-11138 Reviewed-by: Denis (cherry picked from commit 84756e043fa2bd9c83b24abffb280290ad3667cd)
* Fixed a crash in menubar with invisible actionsThierry Bastian2011-06-091-1/+1
| | | | | | | | That would happen because the loop to find the next action when navigating with the keyboard was not good enough. Task-number: QTBUG-11823 (cherry picked from commit 8ea60a39a8c4661db505a6dc1342e524ec2e460c)
* QAudioInput push mode does not workKurt Korbatits2011-06-092-15/+40
| | | | | | Task-number:QTBUG-11755 Reviewed-by:Derick Hawcroft (cherry picked from commit e620e6626454f0ee10655033841baa6e3b2f4990)
* No more enter & leave events after a popup menu is closed on WindowsPrasanth Ullattil2011-06-091-3/+20
| | | | | | | | | | | We use the TrackMouseEvent() to keep track of enter and leave messages. Upon receiving a WM_MOUSELEAVE, the effect of that function call is over, we need to call it again if we need more messages. This was not done when we close a popup because of mouse click outside. Task-number: QTBUG-11582 Reviewed-by: Bradley T. Hughes (cherry picked from commit d806b996beab76cbc43ffa11bc38721fa19c9c81)
* Phonon(qt7); Don't try and display video frames when audio only.Justin McPherson2011-06-091-7/+9
| | | | | Task-number: QTBUG-9068 (cherry picked from commit f02bb3b14ab0257a11cb9cde692f87a046c0308b)
* Audio(osx); Fix period size calculation.Justin McPherson2011-06-091-13/+2
| | | | | | Task-number: QTBUG-8878 Reviewed-by:Dmytro Poplavskiy (cherry picked from commit 76c256bdabcc207a6ed70d5b5b62698495548a25)
* Fix for a leak in the mac style.Denis Dzyubenko2011-06-091-1/+1
| | | | | | Task-number: QTBUG-11550 Reviewed-by: Morten Sørvig (cherry picked from commit e4d59c1bd1ac43b65ed8b14d41ab488b8e3782bf)
* Fixed device context leak in QGLWidget on Windows.Kim Motoyoshi Kalland2011-06-091-0/+3
| | | | | | | | | Commit 392123ef5432643d1047d1e1dd71512ec39d382d introduced the leak. Task-number: QTBUG-11432 Reviewed-by: Trond (cherry picked from commit 38adb59a9e80a23d37ff0820ef62ebd45ab1e4ae)
* Fix for emitting changed signal in QClipboardDenis Dzyubenko2011-06-091-2/+2
| | | | | | | | | | | When the app that owns the selection quits and there is no clipboard manager running we emit the changed signal whenever the timestamp of the event we got is greater than our timestamp. Task-number: QTBUG-8157 Reviewed-by: Thiago Macieira Author: Luboš Luňák (cherry picked from commit 1448e36be786648a7764255c24edddc636315427)
* Typo in qcleanlooksstyle.cppOlivier Goffart2011-06-091-1/+1
| | | | | Task-number: QTBUG-11506 (cherry picked from commit e4fbdd4fde9b8d2acc13268b44caa57405c3db1a)
* Audio (osx); In pull mode emit readyRead() for each period received.Justin McPherson2011-06-091-2/+2
| | | | | | Task-number: QTBUG-10009 Reviewed-by:Dmytro Poplavskiy (cherry picked from commit 4f79cbb2b7923ff7f7cbc77dc6820d12f594311d)
* QWidget::childAt for masked child widgets doesn't work properlyBjørn Erik Nilsen2011-06-092-31/+53
| | | | | | | | | | | | | | | Problem was that we didn't take the children's effective mask into account when checking whether a point was inside or not. This commit is also an optimization since we no longer check the point against the widget's rect twice. Furthermore, unnecessary QRegion operations are completely avoided in the common case. Auto tests included. Task-number: QTBUG-7150 Reviewed-by: paul (cherry picked from commit 7101ae5a0e90d97acf86a444c4d51ca45e7863fe)
* Diacritic input broken, duplicate the base glypha (on Mac OS X carbon)Prasanth Ullattil2011-06-091-2/+11
| | | | | | | | | This was a regression introduced by 8da880e77db04c. The saved key event needs to be cleared if we process a valid raw key event. Task-number: QTBUG-7099 Reviewed-by: Richard Moe Gustavsen (cherry picked from commit e30e3bb524536ef0f6b55272901b24bbbd4dfbd6)