summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Changes-4.6.5 file updatedv4.6.54.6-digiaMarko Valtanen2012-12-121-0/+1
| | | | Change-Id: Id22b6c3bfc436427bad863a5ded81d6bd20ffef4
* Fix binary incompatibility between openssl versionsShane Kearns2012-12-123-1/+13
| | | | | | | | | | | | | | | OpenSSL changed the layout of X509_STORE_CTX between 0.9 and 1.0 So we have to consider this struct as private implementation, and use the access functions instead. This bug would cause certificate verification problems if a different version of openssl is loaded at runtime to the headers Qt was compiled against. Task-number: QTBUG-28343 Change-Id: I47fc24336f7d9c80f08f9c8ba6debc51a5591258 Reviewed-by: Richard J. Moore <rich@kde.org> (cherry picked from commit eb2688c4c4f257d0a4d978ba4bf57d6347b15252)
* Changing licensing contact info from nokia to digiajutaipal2012-12-112-3/+3
|
* Changed contact info from qt-info@nokia to qt-project.org/legaljutaipal2012-12-119-15/+15
|
* Nokia to Digia changesjutaipal2012-12-1113-17/+17
|
* Nokia to Digia changesjutaipal2012-12-1024-30/+30
|
* Nokia to Digia changesjutaipal2012-12-1052-171/+171
|
* Updated license, install readme-filesjutaipal2012-12-104-157/+156
|
* Change copyrights from Nokia to Digia.Marko Valtanen2012-12-0567-133/+133
|
* Version bump to 4.6.5Marko Valtanen2012-12-0418-23/+23
|
* Changes-4.6.5 file updatedMarko Valtanen2012-12-041-0/+236
|
* Change copyrights from Nokia to Digia.Marko Valtanen2012-12-049561-90033/+99084
|
* Disable SSL compression by default.Richard Moore2012-12-041-0/+6
| | | | | | | | | | | | Disable SSL compression by default since this appears to be the a likely cause of the currently hyped CRIME attack. This is a backport of 5ea896fbc63593f424a7dfbb11387599c0025c74 from qt5. Change-Id: I8fd01c2a230804d88ffa4599e7fd9293a8af9e0f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Added bugfix QTBUG-14017 and updated changes-4.6.4 filev4.6.4Iikka Eklund2011-06-211-85/+86
|
* fix moc argument quoting on mingwOswald Buddenhagen2011-06-211-5/+5
| | | | | | | | | for some bizarre reason, mingw doesn't like double quotes. so instead of building some more elaborate custom quoting, just let qmake do it for us. Reviewed-by: mariusSO (cherry picked from commit fa5c83003db5dea46fc045b2fd90e6308a0d8911)
* Created changes-4.6.4 fileIikka Eklund2011-06-161-0/+231
|
* Qt version number change into 4.6.4Iikka Eklund2011-06-1620-24/+25
|
* Fix compilation with IBM xlC 7:Thiago Macieira2011-06-161-6/+8
| | | | | | | | "../../../../../include/QtCore/../../src/corelib/kernel/qmetatype.h", line 202.49: 1540-0062 (S) The incomplete class "QMetaTypeId<qdesigner_internal::ArrowKeyOperation>" must not be used as a qualifier. So move the Q_DECLARE_METATYPE before the use. Reviewed-By: hjk <qtc-committer@nokia.com>
* QSslCertificate: report fraudulent certificates as invalidPeter Hartmann2011-06-1612-4/+213
| | | | | | | | | | | 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)
* syncqt: fix wrong paths in include/ActiveQt/headers.priJoerg Bornemann2011-06-091-1/+1
| | | | | | | | | | | | | | | Assigning a semicolon separated list of directories to a Qt module does not work correctly. The values of %modules must be split into single values before operating on them. This doesn't happen in all places. ActiveQt is the only module where this feature is used. Also, it is not needed anymore for this particular module. Thus, I'll just remove the semicolon separated list from ActiveQt and replace it with the module directory. Task-number: QTBUG-4586 Reviewed-by: ossi (cherry picked from commit 29dcc069ba9a2c38b4461d5fd19d5fa9a1531595)
* Fix handling of SSL certificates with wildcard domain namesRichard J. Moore2011-06-093-4/+63
| | | | | | | 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-092-1/+42
| | | | | | | | | | | | | | 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-093-3/+13
| | | | | | | | | | 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)
* Fix audio glitches in the audiooutput example.Andrew den Exter2011-06-091-2/+2
| | | | | | | | | | The data copy loop didn't advance the write position, resulting in some of the output buffer being overwritten and some of it not written to at all. Task-number: QTBUG-13751 Reviewed-by: Justin McPherson (cherry picked from commit a006881b2297e4dbf03051f82a8abb1363ceeebb)
* 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-092-5/+62
| | | | | | | | | 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-092-61/+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-092-24/+39
| | | | | | | | | | | | 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)
* qmake: fix quoting of moc callsJoerg Bornemann2011-06-091-2/+2
| | | | | | Task-number: QTBUG-13782 Reviewed-by: ossi (cherry picked from commit 36fc9e830b828b69c4df775c68c07c25c9bab4cf)
* 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-092-0/+21
| | | | | | | | | 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)
* QMake/Win32/MinGW: Fix ar script generating with absolute pathsTuomas Suutari2011-06-091-4/+1
| | | | | | | | | | | | | | | | | | | | | | When QMake decides to use absolute path for some object file, this code used to leave the ADDMOD command out from the ar object script, which resulted in following errors from the issued "ar -M" command: Syntax error in archive script, line 2 Syntax error in archive script, line 3 etc... And the build failed in the linking phase, because the generated static library was empty. Fix this issue by prepending the file name with ADDMOD command even if the file path is absolute. Task-number: QTBUG-12959 Merge-request: 2451 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 0e443155c99a1ba9b990e7a2195132b2b8a1d36e)
* qmake: fix assertion on Windows when DESTDIR is empty in static libsJoerg Bornemann2011-06-091-3/+6
| | | | | | | | | Basically replacing project->values("foo").first() with project->first("foo") which does a null check. Task-number: QTBUG-12851 Reviewed-by: ossi (cherry picked from commit f087ad801b19ffa32a538269cd1475ead963f013)
* 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-093-50/+101
| | | | | | | | | | 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)
View Lorry Controller Status