qt:qt.git
5 years agoChanges-4.6.5 file updated 4.6-digia v4.6.5
Marko Valtanen [Wed, 12 Dec 2012 10:27:13 +0000 (12:27 +0200)]
Changes-4.6.5 file updated

Change-Id: Id22b6c3bfc436427bad863a5ded81d6bd20ffef4

5 years agoFix binary incompatibility between openssl versions
Shane Kearns [Thu, 6 Dec 2012 17:03:18 +0000 (17:03 +0000)]
Fix binary incompatibility between openssl versions

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)

5 years agoChanging licensing contact info from nokia to digia
jutaipal [Tue, 11 Dec 2012 09:14:14 +0000 (01:14 -0800)]
Changing licensing contact info from nokia to digia

5 years agoChanged contact info from qt-info@nokia to qt-project.org/legal
jutaipal [Tue, 11 Dec 2012 09:08:36 +0000 (01:08 -0800)]
Changed contact info from qt-info@nokia to qt-project.org/legal

5 years agoNokia to Digia changes
jutaipal [Tue, 11 Dec 2012 09:03:29 +0000 (01:03 -0800)]
Nokia to Digia changes

5 years agoNokia to Digia changes
jutaipal [Mon, 10 Dec 2012 15:28:43 +0000 (07:28 -0800)]
Nokia to Digia changes

5 years agoNokia to Digia changes
jutaipal [Mon, 10 Dec 2012 15:27:14 +0000 (07:27 -0800)]
Nokia to Digia changes

5 years agoUpdated license, install readme-files
jutaipal [Mon, 10 Dec 2012 15:24:49 +0000 (07:24 -0800)]
Updated license, install readme-files

5 years agoChange copyrights from Nokia to Digia.
Marko Valtanen [Wed, 5 Dec 2012 13:20:02 +0000 (15:20 +0200)]
Change copyrights from Nokia to Digia.

5 years agoVersion bump to 4.6.5
Marko Valtanen [Tue, 4 Dec 2012 14:49:04 +0000 (16:49 +0200)]
Version bump to 4.6.5

5 years agoChanges-4.6.5 file updated
Marko Valtanen [Tue, 4 Dec 2012 14:14:09 +0000 (16:14 +0200)]
Changes-4.6.5 file updated

5 years agoChange copyrights from Nokia to Digia.
Marko Valtanen [Tue, 4 Dec 2012 14:12:48 +0000 (16:12 +0200)]
Change copyrights from Nokia to Digia.

5 years agoDisable SSL compression by default.
Richard Moore [Tue, 18 Sep 2012 21:06:15 +0000 (22:06 +0100)]
Disable SSL compression by default.

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>
7 years agoAdded bugfix QTBUG-14017 and updated changes-4.6.4 file v4.6.4
Iikka Eklund [Tue, 21 Jun 2011 11:23:22 +0000 (14:23 +0300)]
Added bugfix QTBUG-14017 and updated changes-4.6.4 file

7 years agofix moc argument quoting on mingw
Oswald Buddenhagen [Tue, 28 Sep 2010 12:53:44 +0000 (14:53 +0200)]
fix moc argument quoting on mingw

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)

7 years agoCreated changes-4.6.4 file
Iikka Eklund [Tue, 24 May 2011 11:02:48 +0000 (14:02 +0300)]
Created changes-4.6.4 file

7 years agoQt version number change into 4.6.4
Iikka Eklund [Tue, 24 May 2011 07:02:17 +0000 (10:02 +0300)]
Qt version number change into 4.6.4

7 years agoFix compilation with IBM xlC 7:
Thiago Macieira [Wed, 17 Feb 2010 15:58:50 +0000 (16:58 +0100)]
Fix compilation with IBM xlC 7:

"../../../../../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>
7 years agoQSslCertificate: report fraudulent certificates as invalid
Peter Hartmann [Thu, 24 Mar 2011 13:42:22 +0000 (14:42 +0100)]
QSslCertificate: report fraudulent certificates as invalid

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)

7 years agosyncqt: fix wrong paths in include/ActiveQt/headers.pri
Joerg Bornemann [Mon, 12 Jul 2010 08:44:12 +0000 (10:44 +0200)]
syncqt: fix wrong paths in include/ActiveQt/headers.pri

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)

7 years agoFix handling of SSL certificates with wildcard domain names
Richard J. Moore [Sun, 6 Jun 2010 21:10:08 +0000 (22:10 +0100)]
Fix handling of SSL certificates with wildcard domain names

Merge-request: 731
Task-number: QTBUG-4455
Reviewed-by: Peter Hartmann
(cherry picked from commit 5f6018564668d368f75e431c4cdac88d7421cff0)

7 years agoFix Qt applications freezing until mouse/keyboard events occur.
Bradley T. Hughes [Mon, 30 Aug 2010 12:57:06 +0000 (14:57 +0200)]
Fix Qt applications freezing until mouse/keyboard events occur.

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
7 years agoLayout direction change by key should change alignment of QLineEdit
Eskil Abrahamsen Blomfeldt [Tue, 29 Jun 2010 08:24:44 +0000 (10:24 +0200)]
Layout direction change by key should change alignment of QLineEdit

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)

7 years agoFix QMutex can deadlock when calling tryLock
Olivier Goffart [Wed, 2 Feb 2011 10:31:20 +0000 (11:31 +0100)]
Fix QMutex can deadlock when calling tryLock

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)

7 years agoFix crash in indeterminate progressbars on windows
Jens Bache-Wiig [Wed, 22 Dec 2010 16:13:30 +0000 (17:13 +0100)]
Fix crash in indeterminate progressbars on windows

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)

7 years agoqgrayraster: Speed up rendering of small cubic splines.
Andreas Kling [Mon, 16 Aug 2010 02:33:03 +0000 (04:33 +0200)]
qgrayraster: Speed up rendering of small cubic splines.

Based on these upstream freetype2 commits:

7fb3ef64a24489189113f693696eaf935f500c3f
e419f48b40a746465a6c8e1d446b407b8677bfed

Reviewed-by: Samuel Rødal
(cherry picked from commit a9c0fbd5e946ae6e90b6db6dd4aea64c824a4066)

7 years agoFix OpenVG painting artifacts after restoreState().
Jason Barron [Mon, 1 Nov 2010 09:14:02 +0000 (10:14 +0100)]
Fix OpenVG painting artifacts after restoreState().

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)

7 years agoDisable the unified toolbar before entering
Fabien Freling [Fri, 15 Oct 2010 11:20:42 +0000 (13:20 +0200)]
Disable the unified toolbar before entering
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)

7 years agoFix audio glitches in the audiooutput example.
Andrew den Exter [Wed, 22 Sep 2010 02:28:24 +0000 (12:28 +1000)]
Fix audio glitches in the audiooutput example.

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)

7 years agoFixed a buffer overrun when pasting large data from non-Qt apps
Denis Dzyubenko [Wed, 6 Oct 2010 08:31:37 +0000 (10:31 +0200)]
Fixed a buffer overrun when pasting large data from non-Qt apps

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)

7 years agoFix copying large data to non-Qt applications
Denis Dzyubenko [Tue, 5 Oct 2010 15:39:57 +0000 (17:39 +0200)]
Fix copying large data to non-Qt applications

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)

7 years agoFix QScriptEngine::abortEvaluation.
Jedrzej Nowacki [Thu, 30 Sep 2010 11:17:39 +0000 (13:17 +0200)]
Fix QScriptEngine::abortEvaluation.

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)

7 years agoFixed crash when using Qt::WA_DeleteOnClose on a QPrintDialog on Mac.
Trond Kjernåsen [Tue, 28 Sep 2010 08:44:07 +0000 (10:44 +0200)]
Fixed crash when using Qt::WA_DeleteOnClose on a QPrintDialog on Mac.

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)

7 years agoFixed floating point overflow issues in QRasterizer::rasterizeLine
Samuel Rødal [Thu, 23 Sep 2010 08:04:39 +0000 (10:04 +0200)]
Fixed floating point overflow issues in QRasterizer::rasterizeLine

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)

7 years agoFixed scaled point drawing with square cap in raster paint engine.
Samuel Rødal [Mon, 20 Sep 2010 12:54:30 +0000 (14:54 +0200)]
Fixed scaled point drawing with square cap in raster paint engine.

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)

7 years agoqmake: fix quoting of moc calls
Joerg Bornemann [Tue, 21 Sep 2010 14:51:15 +0000 (16:51 +0200)]
qmake: fix quoting of moc calls

Task-number: QTBUG-13782
Reviewed-by: ossi
(cherry picked from commit 36fc9e830b828b69c4df775c68c07c25c9bab4cf)

7 years agoFixes bezier curves not being drawn when it is a line.
Yoann Lopes [Tue, 21 Sep 2010 12:06:59 +0000 (14:06 +0200)]
Fixes bezier curves not being drawn when it is a line.

Some old work-around code is no longer needed...

Task-number: QTBUG-13721
Reviewed-by: Samuel
(cherry picked from commit 9035b78ef8b8ebfdd7d43fc0b9c3071253eb0d56)

7 years agoFixed color of cosmetic pens when printing under Windows.
Trond Kjernåsen [Mon, 20 Sep 2010 12:49:15 +0000 (14:49 +0200)]
Fixed color of cosmetic pens when printing under Windows.

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)

7 years agoPrevent crash in QGLGlyphCache due to dangling context references.
Samuel Rødal [Tue, 14 Sep 2010 12:18:27 +0000 (14:18 +0200)]
Prevent crash in QGLGlyphCache due to dangling context references.

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)

7 years agoQSslSocket: Improve error handling
Peter Hartmann [Mon, 12 Jul 2010 16:32:06 +0000 (18:32 +0200)]
QSslSocket: Improve error handling

Reviewed-by: Markus Goetz
Task-number: QT-3567
(cherry picked from commit c25c7c9bdfade6b906f37ac8bad44f6f0de57597)
(cherry picked from commit 151983bd827c8a05b8798560ade4d911a04156c3)

7 years agoMinor performance improvement to QGraphicsItem::update.
Bjørn Erik Nilsen [Thu, 2 Sep 2010 06:11:18 +0000 (08:11 +0200)]
Minor performance improvement to QGraphicsItem::update.

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)

7 years agoFix some missing proxy calles for CleanLooks
Jens Bache-Wiig [Wed, 1 Sep 2010 08:39:54 +0000 (10:39 +0200)]
Fix some missing proxy calles for CleanLooks

These were simply left out as an oversight.

Task-number: QTBUG-13318
(cherry picked from commit 1f5d88dd327be635966ed9e3811c8803a163b2a4)

7 years agoQSslConfiguration: fix crash when accessing null pointer
Peter Hartmann [Mon, 30 Aug 2010 13:43:01 +0000 (15:43 +0200)]
QSslConfiguration: fix crash when accessing null pointer

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)

7 years agoFix the broken unicode detection of ODBC driver.
Charles Yin [Tue, 24 Aug 2010 05:15:29 +0000 (15:15 +1000)]
Fix the broken unicode detection of ODBC driver.
the unicode flag is entirely overrided by mistake.

Task-number:QTBUG-13109
Reviewed-by:Michael Goddard
(cherry picked from commit 67ddb9cca2b638b1cf71eb98e906260b83a38677)

7 years agoQFileDialog::HideNameFilterDetails breaks Cocoa QFileDIalog filter
Richard Moe Gustavsen [Fri, 20 Aug 2010 08:06:04 +0000 (10:06 +0200)]
QFileDialog::HideNameFilterDetails breaks Cocoa QFileDIalog filter

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)

7 years agoCrash in QX11PaintEngine::drawPixmap
Carlos Manuel Duclos Vergara [Wed, 11 Aug 2010 13:47:40 +0000 (15:47 +0200)]
Crash in QX11PaintEngine::drawPixmap

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)

7 years agoQMake/Win32/MinGW: Fix ar script generating with absolute paths
Tuomas Suutari [Wed, 18 Aug 2010 10:41:24 +0000 (12:41 +0200)]
QMake/Win32/MinGW: Fix ar script generating with absolute paths

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)

7 years agoqmake: fix assertion on Windows when DESTDIR is empty in static libs
Joerg Bornemann [Tue, 17 Aug 2010 14:00:17 +0000 (16:00 +0200)]
qmake: fix assertion on Windows when DESTDIR is empty in static libs

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)

7 years agoQXmlStreamReader: avoid unnecessary detaching
Peter Hartmann [Thu, 5 Aug 2010 09:56:47 +0000 (11:56 +0200)]
QXmlStreamReader: avoid unnecessary detaching

Reviewed-by: Markus Goetz
Task-number: QTBUG-12259
(cherry picked from commit c7fcd56bd3e150e57230ea1445bf4286b3f3fabe)

7 years agoQSslCertificate: support expiration dates > 2049
Peter Hartmann [Wed, 4 Aug 2010 09:59:49 +0000 (11:59 +0200)]
QSslCertificate: support expiration dates > 2049

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)

7 years agoFix QString::arg: When specifying %L1, the group separator would be added even if...
Olivier Goffart [Mon, 9 Aug 2010 12:11:46 +0000 (14:11 +0200)]
Fix QString::arg: When specifying %L1, the group separator would be added even if the local specify QLocale::OmitGroupSeparator

Task-number: QTBUG-9281
Reviewed-by: Denis
(cherry picked from commit 720f4ca0ec3b42a101ac24b2cf74cdc87d29eac9)

7 years agoFixed potential infinite loop in QFileSystemWatcher on Mac.
Denis Dzyubenko [Mon, 2 Aug 2010 11:21:05 +0000 (13:21 +0200)]
Fixed potential infinite loop in QFileSystemWatcher on Mac.

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)

7 years agoFix crash when all the items in a QListView are hidden
Gabriel de Dietrich [Mon, 26 Jul 2010 18:51:32 +0000 (20:51 +0200)]
Fix crash when all the items in a QListView are hidden

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)

7 years agoFixed QVideoSurfaceFormat::isValid()
Dmytro Poplavskiy [Thu, 22 Jul 2010 02:42:34 +0000 (12:42 +1000)]
Fixed QVideoSurfaceFormat::isValid()

Trivial fix, valid formats have pixel format != Invalid, not ==.

Task-number: QTBUG-12337
Reviewed-by: Andrew den Exter
(cherry picked from commit 51cf737151c1c446a9ce77832774202b6bdb4ba2)

7 years agoFix an Assert in QTextTable
Pierre Rossi [Fri, 2 Jul 2010 17:31:51 +0000 (19:31 +0200)]
Fix an Assert in QTextTable

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)

7 years agoFix a crash when recursing into QSharedPointer from QSharedPointer::clear()
Thiago Macieira [Fri, 9 Jul 2010 15:43:19 +0000 (17:43 +0200)]
Fix a crash when recursing into QSharedPointer from QSharedPointer::clear()

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)

7 years agoInitalize the nativeDialogInUse variable
Andy Shaw [Thu, 8 Jul 2010 13:27:14 +0000 (15:27 +0200)]
Initalize the nativeDialogInUse variable

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)

7 years agoDon't try and use QFactoryLoader when relevant features are turned off.
Justin McPherson [Wed, 7 Jul 2010 05:21:48 +0000 (15:21 +1000)]
Don't try and use QFactoryLoader when relevant features are turned off.

Task-number: QTBUG-11900
Reviewed-by: Andrew den Exter
(cherry picked from commit 2de46daf6568c85d976a1e784c0bafbea89adb3a)

7 years agoFixed size hint for combo box on windows
Jens Bache-Wiig [Fri, 11 Jun 2010 10:53:07 +0000 (12:53 +0200)]
Fixed size hint for combo box on windows

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)

7 years agoSegmentation Fault in QAudioOutputPrivate::freeBlocks() caused by wrong
Kurt Korbatits [Fri, 2 Jul 2010 00:12:47 +0000 (10:12 +1000)]
Segmentation Fault in QAudioOutputPrivate::freeBlocks() caused by wrong
pointer increment

Task-number:QTBUG-11883
Reviewed-by:Andrew den Exter
(cherry picked from commit 6d5e561be6f013f7cb5c77e15ee6b7640cad7563)

7 years agoCrash while changing the windows flags from a Qt::Drawer window on Cocoa
Prasanth Ullattil [Wed, 30 Jun 2010 14:10:59 +0000 (16:10 +0200)]
Crash while changing the windows flags from a Qt::Drawer window on Cocoa

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)

7 years agoFixed a crash in menubar with invisible actions
Thierry Bastian [Wed, 30 Jun 2010 10:15:49 +0000 (12:15 +0200)]
Fixed a crash in menubar with invisible actions

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)

7 years agoQAudioInput push mode does not work
Kurt Korbatits [Tue, 29 Jun 2010 02:54:11 +0000 (12:54 +1000)]
QAudioInput push mode does not work

Task-number:QTBUG-11755
Reviewed-by:Derick Hawcroft
(cherry picked from commit e620e6626454f0ee10655033841baa6e3b2f4990)

7 years agoNo more enter & leave events after a popup menu is closed on Windows
Prasanth Ullattil [Thu, 24 Jun 2010 13:02:02 +0000 (15:02 +0200)]
No more enter & leave events after a popup menu is closed on Windows

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)

7 years agoPhonon(qt7); Don't try and display video frames when audio only.
Justin McPherson [Tue, 22 Jun 2010 06:59:08 +0000 (16:59 +1000)]
Phonon(qt7); Don't try and display video frames when audio only.

Task-number: QTBUG-9068
(cherry picked from commit f02bb3b14ab0257a11cb9cde692f87a046c0308b)

7 years agoAudio(osx); Fix period size calculation.
Justin McPherson [Tue, 22 Jun 2010 02:01:51 +0000 (12:01 +1000)]
Audio(osx); Fix period size calculation.

Task-number: QTBUG-8878
Reviewed-by:Dmytro Poplavskiy
(cherry picked from commit 76c256bdabcc207a6ed70d5b5b62698495548a25)

7 years agoFix for a leak in the mac style.
Denis Dzyubenko [Mon, 21 Jun 2010 11:48:55 +0000 (13:48 +0200)]
Fix for a leak in the mac style.

Task-number: QTBUG-11550
Reviewed-by: Morten Sørvig
(cherry picked from commit e4d59c1bd1ac43b65ed8b14d41ab488b8e3782bf)

7 years agoFixed device context leak in QGLWidget on Windows.
Kim Motoyoshi Kalland [Fri, 18 Jun 2010 13:09:12 +0000 (15:09 +0200)]
Fixed device context leak in QGLWidget on Windows.

Commit 392123ef5432643d1047d1e1dd71512ec39d382d introduced the
leak.

Task-number: QTBUG-11432
Reviewed-by: Trond
(cherry picked from commit 38adb59a9e80a23d37ff0820ef62ebd45ab1e4ae)

7 years agoFix for emitting changed signal in QClipboard
Denis Dzyubenko [Thu, 17 Jun 2010 16:09:51 +0000 (18:09 +0200)]
Fix for emitting changed signal in QClipboard

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)

7 years agoTypo in qcleanlooksstyle.cpp
Olivier Goffart [Thu, 17 Jun 2010 08:24:49 +0000 (10:24 +0200)]
Typo in qcleanlooksstyle.cpp

Task-number: QTBUG-11506
(cherry picked from commit e4fbdd4fde9b8d2acc13268b44caa57405c3db1a)

7 years agoAudio (osx); In pull mode emit readyRead() for each period received.
Justin McPherson [Wed, 16 Jun 2010 06:44:18 +0000 (16:44 +1000)]
Audio (osx); In pull mode emit readyRead() for each period received.

Task-number: QTBUG-10009
Reviewed-by:Dmytro Poplavskiy
(cherry picked from commit 4f79cbb2b7923ff7f7cbc77dc6820d12f594311d)

7 years agoQWidget::childAt for masked child widgets doesn't work properly
Bjørn Erik Nilsen [Fri, 4 Jun 2010 10:12:01 +0000 (12:12 +0200)]
QWidget::childAt for masked child widgets doesn't work properly

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)

7 years agoDiacritic input broken, duplicate the base glypha (on Mac OS X carbon)
Prasanth Ullattil [Fri, 23 Apr 2010 08:31:39 +0000 (10:31 +0200)]
Diacritic input broken, duplicate the base glypha (on Mac OS X carbon)

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)

7 years agoFix QTransform::map(const QPainterPath &) not working with paths that
Simon Hausmann [Mon, 7 Jun 2010 09:41:10 +0000 (11:41 +0200)]
Fix QTransform::map(const QPainterPath &) not working with paths that
have only one element

Replaced the isEmpty() check for the shortcut in map() with elementCount() == 0

Task-number: QTBUG-11264
Reviewed-by: Samuel
(cherry picked from commit 90e009e9e273a4fea5166007e4c2b0638c6588cd)

7 years agofix misleading hint
Oswald Buddenhagen [Thu, 3 Jun 2010 18:26:47 +0000 (20:26 +0200)]
fix misleading hint

it is "FOO=bar ./configure", not "./configure FOO=bar".

Task-number: QTBUG-11058
(cherry picked from commit bd49bada206f233bbac09ce1333db42d2a8a0485)

7 years agosupport TARGETs with spaces
Oswald Buddenhagen [Thu, 3 Jun 2010 16:39:19 +0000 (18:39 +0200)]
support TARGETs with spaces

this is quite a hack, but the quoting is terminally broken anyway, so
...

Task-number: QTBUG-10384
(cherry picked from commit 417771c1a5434885e1e7bc1edcd93a36e7a7fe52)

7 years agoStyled item view backgrounds in Gtk+
Jens Bache-Wiig [Thu, 3 Jun 2010 15:50:06 +0000 (17:50 +0200)]
Styled item view backgrounds in Gtk+

These were currently never themed but used a fake gradient
to mimick ClearLooks. I had to add a workaround for the
case where you were using custom QItemDelegates since this
could result in styled background on tree branches but
flat items.

Task-number: QTBUG-11209
Reviewed-by: thorbjorn
(cherry picked from commit 29e294aee281b7a4dcdd1277eef0fe1552015536)

7 years agoQString: Fix severals bugs when comparing with QStringRef
Olivier Goffart [Thu, 3 Jun 2010 09:03:14 +0000 (11:03 +0200)]
QString: Fix severals bugs when comparing with QStringRef

the internal ucstricmp and ucstrcmp contains different bugs if the
strings are not 0-terminated, as it is with QStringRef.

- in ucstricmp, even if the pointer are the same, the lenght could
  be different
- we used to deference the 'end' pointer, that would be 0 if the
  string ends with 0, but we cannot do that in the general case

Task-number: QTBUG-10404
Reviewed-by: Denis
(cherry picked from commit cd003bfcf9a05967893099e8948ba3d8f281aa7d)

7 years agoQSslCertificate: support large serial numbers
Peter Hartmann [Tue, 1 Jun 2010 14:50:55 +0000 (16:50 +0200)]
QSslCertificate: support large serial numbers

We were calling an OpenSSL function that returned a long for the serial
number; sometimes serial numbers are too big to fit into a long (up to
20 octets). In that case, do not convert the serial number to decimal,
but just output the hexadecimal value.

Reviewed-by: Zeno Albisser
Task-number: QTBUG-9973
(cherry picked from commit 0f16c7ce8dcd6f4905d14875088c55148e41366a)

7 years agoFixed alpha check for mono images.
Kim Motoyoshi Kalland [Tue, 1 Jun 2010 08:36:47 +0000 (10:36 +0200)]
Fixed alpha check for mono images.

Task-number: QTBUG-9072
Reviewed-by: Trond
(cherry picked from commit bcafe4a3dde9986ecfdeea43dc592b6f54134893)

7 years agoFix antialiasing with transformed text in OpenGL2 paint engine
Eskil Abrahamsen Blomfeldt [Mon, 31 May 2010 06:36:52 +0000 (08:36 +0200)]
Fix antialiasing with transformed text in OpenGL2 paint engine

Since the paint engine now transforms the prerendered glyphs instead of
rendering transformed glyphs as paths, we need to turn on texture
filtering to avoid antialiasing artifacts. In order to do this, we also
need to pad the glyphs in the glyph cache, otherwise you will get
artifacts when sampling the area around the glyph's bounding rect (where
there might be other glyphs.) This done by adding a glyphPadding()
function to the cache which returns the number of pixels to pad between
each glyph.

Updated: This also fixes a general issue where some combinations of font
sizes and transformations will cause the engine to sample neighbouring
glyphs, so this has been backported to Qt 4.6.x.

Task-number: QTBUG-9706, QTBUG-11028
Reviewed-by: Tom
Conflicts:

src/gui/painting/qtextureglyphcache.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
(cherry picked from commit 21f5bf3a3030a393ba17ce7726b70fe853b5b608)

7 years agoFixed a crash when creating QGtkStyle before QApplication
Jens Bache-Wiig [Thu, 27 May 2010 10:15:54 +0000 (12:15 +0200)]
Fixed a crash when creating QGtkStyle before QApplication

Task-number: QTBUG-10758
Reviewed-by: ogoffart
(cherry picked from commit bc5e4da28c1ffbc0da1cbfcaa1e6236ff4c2d4e3)

7 years agoDont crash when assigning the same input context twice.
Denis Dzyubenko [Tue, 25 May 2010 15:27:38 +0000 (17:27 +0200)]
Dont crash when assigning the same input context twice.

Added a guard check to return if the given input context is the same is we
already have.

Explicitly mention in the doc that we take ownership of the given input context
object.

Task-number: QTBUG-10780
Reviewed-by: Thomas Zander
(cherry picked from commit a32c96e753c2f5a123e518a92762ec9c9ff3b0b7)

7 years agoFix platform regression: Support QFont::setStretch() on Cocoa
Eskil Abrahamsen Blomfeldt [Wed, 19 May 2010 09:38:58 +0000 (11:38 +0200)]
Fix platform regression: Support QFont::setStretch() on Cocoa

QFont::setStretch() would previously have no effect on Mac OS X/Cocoa.

Task-number: QTBUG-10585
Reviewed-by: Eskil
Done-by: Andy
(cherry picked from commit 8cbf269e14b372ee3174c2706dd0cc4df37eef1a)

7 years agoFix a memory leak from QItemSelectionModel when changing the model
Thierry Bastian [Wed, 19 May 2010 08:58:11 +0000 (10:58 +0200)]
Fix a memory leak from QItemSelectionModel when changing the model

Reviewed-By: ogoffart
Task-Number: QTBUG-10806
(cherry picked from commit 28b894f65c5aba01d5ee80c20f617478faaee7e7)

7 years agoOptimize QPixmapIconEngine's pixmap() function
aavit [Mon, 10 May 2010 14:23:44 +0000 (16:23 +0200)]
Optimize QPixmapIconEngine's pixmap() function

Replace needlessly expensive cache key generation

Task-number: QTBUG-9850
Reviewed-by: Trond
(cherry picked from commit ad6dafee9be288bcef6b2c4b318b234d2995abff)

7 years agoFix compiler warning in QT_REQUIRE_VERSION
Olivier Goffart [Tue, 11 May 2010 10:49:32 +0000 (12:49 +0200)]
Fix compiler warning in QT_REQUIRE_VERSION

 warning: format not a string literal and no format arguments

Task-number: QTBUG-8967
Reviewed-by: Gabriel
(cherry picked from commit 814f7d3d607edacca091273302297b6b2674424f)

7 years agoFixed the sizing of the dock area with fixed size dock widgets
Thierry Bastian [Wed, 5 May 2010 15:41:20 +0000 (17:41 +0200)]
Fixed the sizing of the dock area with fixed size dock widgets

It could happen that a dock area could be too wide. The problem
was that we didn't really care whether or not the tab bar was visible.
We would always take its minimum sizehint into account.

Task-Number: QTBUG-10391
Reviewed-By: gabi
(cherry picked from commit 8f53bf1b99d32caaebe8cbd1d9bd3a7381821988)

7 years agoDon't leak QVistaHelper from QWizard
Bradley T. Hughes [Wed, 5 May 2010 11:59:31 +0000 (13:59 +0200)]
Don't leak QVistaHelper from QWizard

The default QObject constructor was not called, meaning the vista helper
was never registered as a child of the QWizard (and therefore never
deleted when the QWizard was destructed).

Task-number: QTBUG-10203
Reviewed-by: olivier
(cherry picked from commit 6bc32600d2367e78ddc39dd93694e01d4d75958d)

7 years agoFix a bug in QGraphicsItem::scroll.
Alexis Menard [Wed, 5 May 2010 07:37:01 +0000 (09:37 +0200)]
Fix a bug in QGraphicsItem::scroll.

If the rect argument is null, well we should not do the scrolling with
an null rectangle but rather with the boundingRect like the documentation
says.

Task-number:QTBUG-10400
Reviewed-by:janarve
(cherry picked from commit 44144cf60e978f7d5d70aec49d114d57832a78c3)

7 years agoFix rtl issues with sliders in GTK style
Jens Bache-Wiig [Tue, 4 May 2010 13:14:56 +0000 (15:14 +0200)]
Fix rtl issues with sliders in GTK style

Sliders that draw groove decorations did not invert appearance
correctly in vertical or rtl cases. With this fix we will
flip the rectangles of the respective decorations and tell
gtk if we are using an rtl widget or not.

Task-number: QTBUG-8986
Reviewed-yb: thorbjorn
(cherry picked from commit d52cc1ded5f30a6da0d11b9c3f7de66b2d3e9ee9)

7 years agoFix missing pressed state for scrollbars with QGtkStyle
Jens Bache-Wiig [Tue, 4 May 2010 12:04:48 +0000 (14:04 +0200)]
Fix missing pressed state for scrollbars with QGtkStyle

Pushing this to 4.7 as it is an easy fix and highly noticable
in the latest official release of Ubuntu.

Task-number: QTBUG-10396
Reviewed-by: thorbjorn
(cherry picked from commit 5c1fe0fc017e116b2643d2b8278f7fca6fec10a1)

7 years agoSecure Cookies should only be sent over secure connections.
Robert Hogan [Tue, 27 Apr 2010 20:22:19 +0000 (21:22 +0100)]
Secure Cookies should only be sent over secure connections.

http://bugreports.qt.nokia.com/browse/QTBUG-9618

QtWebKit currently fails the following test:

LayoutTests/http/tests/xmlhttprequest/cookies.html

This is because QNetworkCookieJar::cookiesForUrl returns secure
cookies even when the connection is not secure.

A 'secure' cookie is set by response headers from a http  server as follows:

'Set-Cookie: cookie-name=value; secure'

Correct QNetworkCookieJar::cookiesForUrl to ignore secure cookies when the
url in the request is not 'https:'.

Task-number: QTBUG-9618
Merge-request: 2372
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
(cherry picked from commit 483fdd017d9998c6d7f4a035ca615e15fbc97e6a)

7 years agoFixed the sizehint for cols/rows in qtableview
Thierry Bastian [Wed, 28 Apr 2010 12:12:59 +0000 (14:12 +0200)]
Fixed the sizehint for cols/rows in qtableview

It could return wrong values because we were not always checking
the right cols/rows.

Reviewed-By: gabi
Task-Number: QTBUG-10169
(cherry picked from commit 8bde410a6d0b1510d182a365d769db182b1c07dd)

7 years agoCocoa: Native QFileDialog has problems selecting name filter
Richard Moe Gustavsen [Tue, 27 Apr 2010 07:01:36 +0000 (09:01 +0200)]
Cocoa: Native QFileDialog has problems selecting name filter

The problem occured if you told the dialog to not show name filter
details, then tried to select a filter specifying those details.
The patch makes sure that we accept a filter as found in the
drop down list if it matches the specified filter with or
without details

Task-number: QTBUG-8439
Reviewed-by: msorvig
(cherry picked from commit 09c6d182a70f25626e12a739a9b7c3db937f47ce)

7 years agoQTabBar: Widgets inside the tab bar where not properly laid out after moveTab()
Gabriel de Dietrich [Fri, 23 Apr 2010 08:22:44 +0000 (10:22 +0200)]
QTabBar: Widgets inside the tab bar where not properly laid out after moveTab()

Only the leftmost tab was being correctly laid out after the move due
to a mistake in QTabBarPrivate::layoutTab().

Auto-test included.

Reviewed-by: Thierry
Task-number: QTBUG-10052
(cherry picked from commit 4743831d128dfad4ac9fbafa6e7544dbe7fb7ed2)

7 years agoFixes wrong QGraphicsView's viewport cursor reset.
Yoann Lopes [Wed, 21 Apr 2010 11:24:27 +0000 (13:24 +0200)]
Fixes wrong QGraphicsView's viewport cursor reset.

The cursor was reset even when it had not been previously saved.
Autotest included.

Task-number: QTBUG-7438
Reviewed-by: bnilsen
(cherry picked from commit ad0c6b17cde4a3ce0041d1a54b96ccb5a6792520)

7 years agoFixed assert failure when trying to load invalid SVG file.
Kim Motoyoshi Kalland [Tue, 20 Apr 2010 13:24:13 +0000 (15:24 +0200)]
Fixed assert failure when trying to load invalid SVG file.

Task-number: QTBUG-10022
Reviewed-by: Trond
(cherry picked from commit 13732b74e07fe10e95f2601f6cf2d0be78467eaa)

7 years agoQScrollArea: Excessive scrolling in focusNextPrevChild()
Gabriel de Dietrich [Fri, 16 Apr 2010 08:56:38 +0000 (10:56 +0200)]
QScrollArea: Excessive scrolling in focusNextPrevChild()

We were scrolling horizontally even though the widget already fit the
visible area horizontally. And conversely for vertical scrolling.

Improves commit f1e92b2fdf6b6fd8aca0d05176c647dd68e21baa.

Reviewed-by: Thierry
Task-number: QTBUG-9425
(cherry picked from commit fa175f7c09e6e664f347ac9804b1a7db1d997ef2)

7 years agoFix writing duplicate headers' properties in designer.
Jarek Kobus [Tue, 13 Apr 2010 13:44:13 +0000 (15:44 +0200)]
Fix writing duplicate headers' properties in designer.

Designer has written verticalHeaderVisible property in ui file twice:
once done implicitly while saving the fake properties and
once done explicitly inside QDesignerResource by calling
saveWidget(QTableView/QTreeView). The latter is removed as
it is redundant now.

Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Task-number: QTBUG-9351
(cherry picked from commit 6f8364ac0c128eb8afe897b5d8f3f4e26b9105f5)