9 years agodocs: more tweaks to offline style v4.8.2
Daniel Molkentin [Wed, 25 Apr 2012 15:13:21 +0000 (17:13 +0200)]
docs: more tweaks to offline style

Change-Id: I50a51da61379a57e0b22785caf11874752ec3bf8
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
9 years agodoc: use hooks introduced to qdoc for correct prev/next disambiguation.
Daniel Molkentin [Wed, 25 Apr 2012 15:03:06 +0000 (17:03 +0200)]
doc: use hooks introduced to qdoc for correct prev/next disambiguation.

Change-Id: I076839b146e2c3f92c884fc932f0ace54d5b3545
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
9 years agoqdoc: Disambiguate prev and next links in html source
Daniel Molkentin [Wed, 25 Apr 2012 14:48:29 +0000 (16:48 +0200)]
qdoc: Disambiguate prev and next links in html source

Change-Id: I46d9bc685c00bb1fc1d79f75eaf8e1f56e57d744
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
9 years agoAdd icons for previous and next page.
Daniel Molkentin [Wed, 25 Apr 2012 12:22:37 +0000 (14:22 +0200)]
Add icons for previous and next page.

Change-Id: I3b16c70b4742a942ceec2035c46618ebc63b697f
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
9 years agodocs: fix conflicting resource file names
Daniel Molkentin [Wed, 25 Apr 2012 12:21:51 +0000 (14:21 +0200)]
docs: fix conflicting resource file names

Change-Id: I10bd6abe214507f663cc7c6a0b3a6f3c69668360
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
9 years agoQDoc: Remove the text around previous and next page links.
Casper van Donderen [Thu, 19 Apr 2012 19:34:42 +0000 (21:34 +0200)]
QDoc: Remove the text around previous and next page links.

Previously we printed "[Previous: <link>] and [Next: <link>]. After this
change we only print the <link>, which should include an icon.

Change-Id: I7bf46623b3bce6b02067127338a1235861449e64
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
9 years agoImproved detection of libcrypto and libssl.
Niels Weber [Fri, 20 Apr 2012 12:31:34 +0000 (14:31 +0200)]
Improved detection of libcrypto and libssl.

The previous solution didn't work on systems where the libraries
aren't in the same location.
Now we search for both libcrypto and libssl and load them if their
versions match, even if they are in different directories.

Task-number: QTBUG-25398
Change-Id: I37164638890586947d07670d8a59fc53a84f9c42
(cherry-picked from commit 8643e1992f6c62983345f89d793742b3449a69ea)
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agoAdd out-of-memory checks to QImage
Pauli Jarvinen [Wed, 25 Apr 2012 12:02:51 +0000 (15:02 +0300)]
Add out-of-memory checks to QImage

Some of the methods of QImage crashed on out-of-memory situation as
they referred to null pointer if creation of a new QImage instance had
failed. Many cases like this were already fixed by commit
a041e4eca3467c1baa6245b6fb47def127f30f41 which was a fix for
QTBUG-1985, but few cases still remained. Now, all the lines creating a
new QImage instance in qimage.cpp have been gone through and sanity
checks have been added where it was necessary to avoid immediate

Task-number: ou1cimx1#994957
Change-Id: I1f07e8890bc91de18af075be73b1a06c667f3776
Reviewed-by: Murray Read <ext-murray.2.read@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
9 years agoOff-by-one-line error in QVGPaintEngine::drawImage
Murray Read [Mon, 23 Apr 2012 11:27:35 +0000 (12:27 +0100)]
Off-by-one-line error in QVGPaintEngine::drawImage

QVGPaintEngine::drawImage(const QPointF &pos, const QImage &image) uses
vgWritePixels if possible, and when the QImage is loaded from some file
types, its lines are inverted, stored from bottom to top in memory.

For inverted images, the image data pointer passed to vgWritePixels
should be pointing at the start of the last line. However drawImage was
actually passing a pointer to after the last line. This has undefined
results, but in practice you either get the image contents drawn one
line too high with the top line missing and and extra garbage bottom
line, or you can also get a crash if beyond the last line is not
readable memory.

Fixed by correcting the pointer passed to vgWritePixels to point to
the start of the last line for inverted images.

Task-number: ou1cimx1#996894
Change-Id: I1cf5b976acc18adceec1e14633f8779441faa056
Reviewed-by: Jani Hautakangas <jani.hautakangas@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
9 years agoSymbian: fix symbian deffiles
Pasi Pentikainen [Mon, 23 Apr 2012 13:28:32 +0000 (16:28 +0300)]
Symbian: fix symbian deffiles

Absent removed and freeze added exports caused by change
If97502bc5367e0faadfaf3bbe70b0c89ef2c75c2 "Moved qmljs_debug_arguments
to QCoreApplication" (commit 8599a0e6397391634ee52197e164f6b7121f9a4d).

Change-Id: I6974d1f38c233b2143fe2e4e59b730b2bab475dc
Reviewed-by: Murray Read <ext-murray.2.read@nokia.com>
Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agoFix QThread start failure due to bad thread name on Symbian
Juha Kukkonen [Fri, 20 Apr 2012 12:20:39 +0000 (15:20 +0300)]
Fix QThread start failure due to bad thread name on Symbian

RThread::Create() deems a thread name to be invalid, if it contains
any of the characters: "*", "?", ":" or character is outside
0x20 - 0x7e range. This matches to the logic in User::ValidateName()
that is used by RThread::Create() to validate thread name.
In addition, maximum thread name length is 80 character on Symbian.

It was possible that thread name contained e.g. colon that caused
RThread::Create() to fail with KErrBadName (-28).

Fix ensures that thread name contains only allowed characters.

Task-number: ou1cimx1#996187
Change-Id: Ie6dd8c60bfed4e2f6cc48607ff0ff940d9cdae8a
Reviewed-by: Murray Read <ext-murray.2.read@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
9 years agoIntegrate Blackberry Platform Services (BPS) with Qt event loop.
Jeff Kehres [Fri, 23 Mar 2012 14:43:44 +0000 (10:43 -0400)]
Integrate Blackberry Platform Services (BPS) with Qt event loop.

This ensures interoperability between the Blackbery C and C++ APIs
and makes it easier to expose platform services in C++ that are
exposed in BPS - since events from both APIs can be processed on
the same thread.

Backport of qtbase 0723e14699704c35d5d61fa7f5e9f3bdbb378afa

Change-Id: Ie0d66e7f9b9984ad3acff61f01665a2b90ef40db
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
9 years agoWindows - "bypass proxy for local..." also affects IP addresses
Shane Kearns [Fri, 20 Apr 2012 14:04:29 +0000 (15:04 +0100)]
Windows - "bypass proxy for local..." also affects IP addresses

If the "bypass proxy for local addresses" option is enabled in
the windows proxy configuration, then do not use the proxy for
any IP address in the subnet of any network interface.

As the systemProxyForQuery api is now offering HTTP proxy tunnels
for TCP sockets, this change avoids local ad-hoc network
connections being routed through the proxy.
In the case where the local address was on a different interface to
the proxy server, it may have been unreachable through the proxy.
For example IP over USB or Bluetooth.

Change-Id: I0842732832a7795112be029d923ed168edc008d6
(modified version of fffc900f78a191970c4eebced9c1af016a9ea6f4 in QtBase)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
9 years agoQSqlQueryModel::fetchMore() documentation fix
Mark Brand [Sun, 22 Apr 2012 21:17:33 +0000 (23:17 +0200)]
QSqlQueryModel::fetchMore() documentation fix

Change-Id: If046e674abad9c2dcff934a2fdd80d4133e1f4ad
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
cherry-picked from qt5/qtbase: 508a90302b5bd2a1b228c62d1a1b24a3e66d24a9
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
9 years agoDo not force OpenGL sample buffers on in the qnx qpa plugin
Sean Harmer [Mon, 23 Apr 2012 14:44:06 +0000 (15:44 +0100)]
Do not force OpenGL sample buffers on in the qnx qpa plugin

Backport of 4c0289c337f7793ec2f6b65bb3493f7299f8e4ef from qtbase

Change-Id: I871629356adf081197bc89e9f28801e5da517c5e
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
9 years agoQHttpNetworkConnectionChannel: Warn if bytesAvailable and no reply
Martin Petersson [Mon, 23 Apr 2012 10:12:18 +0000 (12:12 +0200)]
QHttpNetworkConnectionChannel: Warn if bytesAvailable and no reply

If there are no bytesAvailable and no reply then the channel
can be closed without any need for this warning.

Task-number: QTBUG-9315

Change-Id: Idd461a38ea932305cc227dbd68b9af61b7e855d2
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agoFix IPv6 address returned from QUrl::host
Shane Kearns [Fri, 20 Apr 2012 16:34:34 +0000 (17:34 +0100)]
Fix IPv6 address returned from QUrl::host

When passing an IPv6 address through QNetworkProxyQuery, it
is stored in a QUrl internally.
There was a bug in QUrl where it strips the [] surrounding an
IPv6 address only if they were present in the input, otherwise
it added them.
Now the behaviour is the same as Qt5 ([] are always stripped).

Change-Id: I42e020ce30d18a4108f1dd4428809fed07991680
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
9 years agoUpdate QSettings and Mac OS X documentation with App Store information
Pasi Matilainen [Tue, 17 Apr 2012 12:58:20 +0000 (15:58 +0300)]
Update QSettings and Mac OS X documentation with App Store information

Add information about changing the location of global Qt settings to
QSettings documentation, and general information about submitting Qt
apps to the Mac App Store to the "Qt for Mac OS X - Specific Issues"

Task-number: QTBUG-16549
Change-Id: Ic0210e8f4d3c3f6369032abd5c1e214b4200b179
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
9 years agoFix annotation processing for qtTypeName
Martin Gräßlin [Sun, 22 Apr 2012 08:21:30 +0000 (10:21 +0200)]
Fix annotation processing for qtTypeName

An old annotation was incorrectly ignored and not recognized
as the deprecated annotation causing the tool to exit instead
of printing out a warning and returning the type name.

Change-Id: I703933f1f75ca37e908b095a2bde803226fd01a7
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
9 years agoUpdate com.trolltech -> org.qtproject in the bootstrapped tools
Thiago Macieira [Thu, 29 Mar 2012 14:14:12 +0000 (11:14 -0300)]
Update com.trolltech -> org.qtproject in the bootstrapped tools

The tools will now generate the new org.qtproject annotations only,
matching the XML generator in the library. They accept both types of
annotations as input though -- and will generate a warning about the
older one.

This commit should be backported to Qt 4, so XML files can start to be

Task-number: QTBUG-23274
Change-Id: If298c342ab4774cbca1be1898a01af8b46e80446
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
(cherry-picked from commit f18a6c5fb569ab93e86ca4b75301a7495ba17768)

9 years agoFinish cleaning up com.trolltech -> org.qtproject in QtDBus
Thiago Macieira [Thu, 29 Mar 2012 14:11:03 +0000 (11:11 -0300)]
Finish cleaning up com.trolltech -> org.qtproject in QtDBus

Lots of uses of the annotations and error names, plus a bunch of local
unit test names (including one file that had to be renamed).

The meta object generator is updated to support both the old and new
names. That means some references to com.trolltech *must* remain in the
source code.

Task-number: QTBUG-23274
Change-Id: Icc38ae040232f07c437e7546ee744a4703f41726
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
(cherry-picked from commit e02a144a3c8e7858d879ac2d0038bc7d00906ae6)

9 years agoMoved qmljs_debug_arguments to QCoreApplication
Rafael Roquetto [Mon, 26 Mar 2012 18:55:58 +0000 (11:55 -0700)]
Moved qmljs_debug_arguments to QCoreApplication

Enable the use of the QML debugger without QtGUI
Based on Qt5's 9a096d9e.

Change-Id: If97502bc5367e0faadfaf3bbe70b0c89ef2c75c2
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
9 years agoReduce virtual address space use by JavaScriptCore on Symbian
Murray Read [Tue, 17 Apr 2012 15:35:49 +0000 (16:35 +0100)]
Reduce virtual address space use by JavaScriptCore on Symbian

JavaScriptCore is reserving 128MB address space for each instance
of JSGlobalData that is created in an app. Eg there is one per
QDeclarativeView, via QDeclarativeEngine, via QScriptEngine.
This can contribute to the app running out
of address space and then crashing.

The AlignedBlockAllocator is modified to be a process singleton so that
all JSGlobalData objects share the same instance.
Now there is only one 128MB address space reservation.

Task-number: ou1cimx1#993804
Change-Id: I9e8702810541905d5e9be197a5f6a9fe8e9bd0c5
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
9 years agofix static library names when generating .pc files for pkgconfig
Mark Brand [Thu, 19 Apr 2012 12:48:34 +0000 (14:48 +0200)]
fix static library names when generating .pc files for pkgconfig

c354d16cc64cf516a0b5149cdc9ef74de096a998 added the version extension
which only occurs on the DLL import library.

cherry-picked from qt5/qtbase 8e053a5dfc9b4c8f100b1e77335439774f52fc61
Change-Id: Ie913adf039d7f3a9aadf43f4af014289a8aeacbe
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
9 years agoFix for memory leak in 64 bit ODBC driver's call to SQLGetStmtAttr()
Yan Shapochnik [Wed, 11 Apr 2012 15:29:43 +0000 (11:29 -0400)]
Fix for memory leak in 64 bit ODBC driver's call to SQLGetStmtAttr()

Windows API call to SQLGetStmtAttr() attempts to place an 8 byte value
into the isScrollable variable which of type SQLINTEGER which is a long
and is 32 bit on Windows even when the driver is compiled for 64 bit.
Changing the isScrollable to and 8 byte SQLULEN type.

Task-number: QTBUG-25256
Change-Id: I1aae0b306e8d1ff5fc3b293b3e9ddd40546b85ad
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
9 years agoFix build with QT_NO_WARNING_OUTPUT
Andy Shaw [Tue, 17 Apr 2012 21:20:59 +0000 (23:20 +0200)]

When defining QT_NO_WARNING_OUTPUT then qWarning() is not available so
it should be defined in the same manner as qDebug() in this context
which is as QNoDebug.

The cases in QtNetwork are changed to use qWarning("....") to avoid
having to add in an extra include of QDebug just so that qWarning() is
declared in the QT_NO_WARNING_OUTPUT case.

Task-number: QTBUG-25308
Change-Id: I4960d8943e805697d4c05cc6988306e5c25fc2bb
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
9 years agoFixed networkproxy build under WinCE
Bjoern Breitmeyer [Mon, 16 Apr 2012 12:40:44 +0000 (14:40 +0200)]
Fixed networkproxy build under WinCE

The used functionality is partially not available under WinCE.
qnetworkfunctions_wince.h encapsulates the needed extra symbols.
It only needs to compile as the functions are loaded dynamically.

Change-Id: Ieb9010d4f6c7f94d39918b869ac503976e094e49
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit 0e317af13f24d88a88c41f5efbd3fe9180ec6bee)
Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
9 years agomkspecs: Rename freebsd-g++40 to freebsd-g++46.
Raphael Kubo da Costa [Tue, 17 Apr 2012 17:53:37 +0000 (14:53 -0300)]
mkspecs: Rename freebsd-g++40 to freebsd-g++46.

lang/gcc40 was removed from FreeBSD's ports tree in 2007, and the
lang/gcc port, which provides a stable GCC version newer than the one in
the base system, is currently pointing to the 4.6 series.

Cherry-picked from c7b52e2a2a46047b7b6bca74a39c81cf43f1c864 to

Change-Id: I085e8495d449f47c1cfcf74e7f6511b2a8e3caa1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agodirectfb: Use QPlatformPixmap::fromFile for Qt resources
Holger Hans Peter Freyther [Mon, 23 Jan 2012 12:49:35 +0000 (13:49 +0100)]
directfb: Use QPlatformPixmap::fromFile for Qt resources

Move to fromFile to load Qt resources for two reasons. The
first is that ::fromData creates a QBuffer on our raw data
and is passing that to the QImageReaders. Right now we there
is a QFile -> QByteArray -> QBuffer transition that wastes
cycles. The other reason is that QPlatformPixmap::fromData
did/does not check if the decoded image is null and might
cause a crash because of that.

Change-Id: I800bfe4cd9b5d6a0d3531ed33f4228770703e94f
Original-Id: I7cb92d84874323e7205ab28883cc0fe9ecca1e27
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
9 years agoBump Qt version to 4.8.2
aksalova [Tue, 17 Apr 2012 13:42:49 +0000 (16:42 +0300)]
Bump Qt version to 4.8.2

Change-Id: Iecae324b1ae00c0d6fb6ed36a8f4a27f51a31d07
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Simo Fält <simo.falt@nokia.com>
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
9 years agoSymbian: absent changed exports in symbian def-files
Pasi Pentikainen [Tue, 17 Apr 2012 08:04:09 +0000 (11:04 +0300)]
Symbian: absent changed exports in symbian def-files

Absent the exports changed by b84e033f2e77d108da413c00ee3d9f1636e8ad5b
to enable symbian building.

Change-Id: Ie3d715eea5ec2e955633ecfe019cb7fcaed9377d
Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agoSymbian: absent changed exports in symbian def-files
Pasi Pentikainen [Tue, 17 Apr 2012 09:30:52 +0000 (12:30 +0300)]
Symbian: absent changed exports in symbian def-files

Absent the exports deprecated by ed881474111d635bb90d3e08e9fb70c06d19d48b
to enable symbian building.

Change-Id: I775d0159743d7d61866d910eefa9a0f807c7feff
Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agoqmake vc(x)proj generator: don't create bogus directories
Joerg Bornemann [Mon, 16 Apr 2012 14:09:18 +0000 (16:09 +0200)]
qmake vc(x)proj generator: don't create bogus directories

When creating the temporary project object,
Option::output_dir must be adjusted temporarily.

Task-number: QTBUG-22788
Change-Id: Ibf8897a46b63f48b9e33d7e2168b09e559cecec7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit ac7dd2782f078e66c5240a07fff5a25cdf5ba61b)

9 years agoqmake/Win: fix incomplete generated version resource
Joerg Bornemann [Mon, 16 Apr 2012 09:11:19 +0000 (11:11 +0200)]
qmake/Win: fix incomplete generated version resource

Since Windows Vista the resource language must be included to
make the version information visible in Windows Explorer.

Two new variables have been introduced:
RC_LANG (default: 1033) - resource language
RC_CODEPAGE (default: 1200) - resource codepage

Task-number: QTBUG-23218
Change-Id: I29e102d19501e3b7a43d5096fc4806bc38a4d846
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit 8987e5d2cb7b7816fd0002fd9ad939ab4f08971b)

9 years agoqmake vcxproj generator: fix handling of /MANIFEST:NO linker option
Joerg Bornemann [Mon, 16 Apr 2012 08:27:10 +0000 (10:27 +0200)]
qmake vcxproj generator: fix handling of /MANIFEST:NO linker option

Task-number: QTBUG-23513

Change-Id: I5dd6fb6fd7910e43acd28057133a3ad6613cfc1a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit 31cfe5ca1b5006566051942254d977581a769e3e)

9 years agoqmake: QMakeProject::intValue added
Joerg Bornemann [Mon, 16 Apr 2012 09:07:02 +0000 (11:07 +0200)]
qmake: QMakeProject::intValue added

For variables that are supposed to contain a single int,
this method returns the numeric value.
Only the first value of the variable is taken into account.

Change-Id: Ifa11ba5ac044e0a4703a387a9bcf02043e4681d8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit ee4d723ecc24e6be33b4c30f9693b7fdce79c767)

9 years agoqmake vcproj generator: unused variable removed
Joerg Bornemann [Mon, 16 Apr 2012 07:38:21 +0000 (09:38 +0200)]
qmake vcproj generator: unused variable removed

Change-Id: Iaf8bb1772846001297e1a421c3860f5e4d090a35
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 65425be8fef69733fb1613e1487f3f6b4fb2d472)

9 years agomkspecs: Sync freebsd-g++40 and freebsd-g++.
Raphael Kubo da Costa [Mon, 16 Apr 2012 20:19:14 +0000 (17:19 -0300)]
mkspecs: Sync freebsd-g++40 and freebsd-g++.

Make freebsd-g++40 include gcc-base-unix.conf and g++-unix.conf and
eliminate a lot of duplicate definitions.

Cherry picked from 996672933a61016fdc0ec6d42d536986c5080ac5 to

Change-Id: Iae42f48b4f43e92567b30f340a25f0bd86c43463
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoDo not define QT_AOUT_UNDERSCORE in freebsd-g++'s mkspec.
Raphael Kubo da Costa [Mon, 16 Apr 2012 20:03:09 +0000 (17:03 -0300)]
Do not define QT_AOUT_UNDERSCORE in freebsd-g++'s mkspec.

According to FreeBSD svn r52802 from 1999 the -aout compiler option and
the QT_AOUT_UNDERSCORE trick were already obsolete.

Since the FreeBSD project itself only supports versions 7 and above
these days, the definition can be safely removed.

Cherry-picked from 874ebef4535e5ae43d917595f00edd365150cfd9 to

Change-Id: I93717e7c937f05b36580914608a3d2d1177ef7d6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoRemove the freebsd-g++34 mkspec.
Raphael Kubo da Costa [Tue, 17 Apr 2012 17:58:59 +0000 (14:58 -0300)]
Remove the freebsd-g++34 mkspec.

GCC 3.4 is older than the 4.2.1 in the base system, and should be
removed from the ports tree.

Besides, nobody in their sane mind would want to build Qt with such an
old compiler.

Cherry-picked from 0e8aabadf947926b78de140fabf8be789c96a9ac to

Change-Id: Ie739d839f1b621aeda693ae6f6a78909a557f3dd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoDo not redefine QT_SOCKLEN_T in freebsd-g++'s mkspec.
Raphael Kubo da Costa [Mon, 16 Apr 2012 19:53:52 +0000 (16:53 -0300)]
Do not redefine QT_SOCKLEN_T in freebsd-g++'s mkspec.

QT_SOCKLEN_T was being redefined depending on whether FreeBSD was < or
>= 4, branched in early 1999.

FreeBSD < 7 is not supported by the upstream project anymore, so we
can simplify the code and rely on the QT_SOCKLEN_T definition in
common/posix/qplatformdefs.h instead.

Cherry-picked from 1afad60e6030064fee772c37e2647ae8c891ac2f to

Change-Id: I9883755070d2731b12b1113def17ca217d510d6a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoRefactor navigator event handling
Kevin Krammer [Thu, 12 Apr 2012 16:23:12 +0000 (18:23 +0200)]
Refactor navigator event handling

Separate PPS based navigator event notification handling and implementation
of the actual event handling.

Like the similar refactoring for screen events, this will allow to reuse the
same event handler class for BPS driven event processing.

Backport of 4fac40f8b0e7b2a6f5f41eb82196e8b197bc851a

Change-Id: I388c2fc503db0fb4be7b80f82e280cf2c8b73015
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
9 years agowidgets/qpa: Fix painting to a fully transparent top level widget
Holger Hans Peter Freyther [Mon, 2 Apr 2012 09:59:04 +0000 (11:59 +0200)]
widgets/qpa: Fix painting to a fully transparent top level widget

QWS used to have a line to change the composite mode from SourceOver
to Source for the top level widget. This wasn't used with QPA and I
removed the internal DontSetCompositionMode in qtbase. It turns out that
the QWS way is the most efficient one to initialize the background of
the widget.

The alternative is to have the QPlatformBackingStore::beginPaint
always clear the entire to be painted area and then paint the background
of the widget. The difference of painting each pixel once or twice is
noticable on embedded platforms and in the range of one to two fps.

This does come from Qt5. The change removes the hasFeature test as
CompositionMode_Source is available for all backends.

Reproduce the issue with:
echo "QWidget {background: transparent}" > style.css
./examples/widgets/wiggly/wiggly -stylesheet style.css

Task-number: QTBUG-24526
Change-Id: I3e3f8a263cd3cf9dec8628ca8a3bb28c70572121
Original-Id: Ica4c980bb3bf6eb87ddb5b510ac7493292d01543
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
9 years agoqmake vc(x)project generator: fix VC++ Express detection
Joerg Bornemann [Tue, 10 Apr 2012 16:46:06 +0000 (18:46 +0200)]
qmake vc(x)project generator: fix VC++ Express detection

If VC++ 2010 Express and VC# 2010 Express are installed, then the
installation path is written in two places into the registry.
We're now filtering detected installations with the same installation

Task-number: QTBUG-24956

Change-Id: I401430e7aa81d96c523d8172d2a2e9d40ebdb3ce
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 99a207436924aa1339f48ababa1490675c6a00d3)

9 years agoFix symbol visibility warnings when building uic3
Andy Shaw [Fri, 13 Apr 2012 23:10:16 +0000 (01:10 +0200)]
Fix symbol visibility warnings when building uic3

When building statically we need to hide the symbols that would
otherwise be exported so we add hide_symbols to the CONFIG

Task-number: QTBUG-23035
Change-Id: I29245a6650fa81186085484d7b2b9150b89a1729
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
9 years agoRefactor navigator event handling
Kevin Krammer [Thu, 12 Apr 2012 16:23:12 +0000 (18:23 +0200)]
Refactor navigator event handling

Separate PPS based navigator event notification handling and implementation
of the actual event handling.

Like the similar refactoring for screen events, this will allow to reuse the
same event handler class for BPS driven event processing.

Backport of 4fac40f8b0e7b2a6f5f41eb82196e8b197bc851a

Change-Id: I6896645aedd20e96fdabc7c49c7bd1d762de788f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
9 years agoFix out of bounds use of QVector API.
Stephen Kelly [Thu, 12 Apr 2012 14:55:36 +0000 (16:55 +0200)]
Fix out of bounds use of QVector API.

This is a regression introduced by commit

Task-number: QTBUG-24965
Task-number: QTBUG-25140
Change-Id: Ice9d90ebb81dcc3c0bc166eeb8f77a0ad9d99476
Reviewed-by: David Faure <faure@kde.org>
9 years agoFix crashes in QAccessibleTree::navigate
Frederik Gladhorn [Fri, 13 Apr 2012 13:30:52 +0000 (15:30 +0200)]
Fix crashes in QAccessibleTree::navigate

It's a best practice to return 0 when the iface is

Change-Id: I6dd70b53b975b10b75c246e6f8f7681da2bcb785
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
9 years agoAccessible interface for QPlainTextEdit
José Millán Soto [Fri, 20 Jan 2012 17:27:18 +0000 (18:27 +0100)]
Accessible interface for QPlainTextEdit

Added QAccessiblePlainTextEdit, as an accessible interface for QPlainTextEdit

Change-Id: If0269a49b9fcd1b3e9fcfd32fac912560df28f21
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
9 years agoUse parentheses in statement with && and ||.
Frederik Gladhorn [Fri, 13 Apr 2012 12:54:30 +0000 (14:54 +0200)]
Use parentheses in statement with && and ||.

Change-Id: I4f968559a7371b87343cb5825eb83b0099364cf2
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
9 years agoEnable stack smashing protection on Blackberry platforms
Sean Harmer [Fri, 13 Apr 2012 11:00:05 +0000 (12:00 +0100)]
Enable stack smashing protection on Blackberry platforms

Backport of:


from qtbase.

Change-Id: I2e30a16140eaf417a07674828642b74fc829bda8
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoRemove fileLineEndingTest from networkselftest.
Miikka Heikkinen [Tue, 14 Feb 2012 13:47:27 +0000 (15:47 +0200)]
Remove fileLineEndingTest from networkselftest.

The fileLineEndingTest case doesn't test network in any way and it is
conceptually wrong, too, as any tests where line endings are an issue
should be handled with .gitattributes rather than forcing user to
check out the repo with unix line endings.

Task-number: QTBUG-24271
Change-Id: I73986993edc227cb68b8f61d51cc1cf458d20989
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
(cherry picked from commit fc8f92106d6743d4165de7d8a440b7e5dbd14391)
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agoOnly send progress bar updates when visible.
Frederik Gladhorn [Thu, 12 Apr 2012 06:15:46 +0000 (08:15 +0200)]
Only send progress bar updates when visible.

Screen readers tend to announce progress.
Some applications (for example KMail) have hidden
progress bars that update frequently.

While the applications should be fixed, it's better
not to spam the user with continous progress announcements.

Change-Id: I5f3b5a83dc80594d995b10e58527115de8601c77
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
9 years agoAdd new QSysInfo::symbianVersion() enums
Pasi Pentikainen [Thu, 12 Apr 2012 11:41:29 +0000 (14:41 +0300)]
Add new QSysInfo::symbianVersion() enums

Add new enums for future Symbian platforms.

Task-number: QT-4593
Change-Id: I23b616c6d62d9d56d2b8ec6ac7edb8f6a84211e8
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agoSymbian: avoid crash when inline editing is canceled
Riikka Inkila [Fri, 13 Apr 2012 08:50:53 +0000 (11:50 +0300)]
Symbian: avoid crash when inline editing is canceled

Native side editor state sync request was added into
QCoeFepInputContext::CancelFepInlineEdit method to fix QTBUG-20919:
text prediction word list/bubble didn't disappear from TextArea/
TextField after a tap and the issue was fixed with the sync request.

However Symbian AknFEP was changed in Belle FP1 release so that this
sync request is no longer needed to get rid of the exact word bubble
when inline editing is canceled with a tap and it can actually
currently lead to a crash in the native side with certain input methods
as AknFEP doesn't expect FEP-aware text editors to request editor state
sync within MCoeFepAwareTextEditor::CancelFepInlineEdit call.
Thus the sync request should be made only with older Symbian releases.

Task-number: ou1cimx1#983695
Change-Id: Iab7753bbe8b279f89abc1853824a83ad210c5440
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
9 years agoFix handling for key repeat events in the QPA linux input plugin
Reuben Dowle [Sat, 4 Feb 2012 07:40:27 +0000 (20:40 +1300)]
Fix handling for key repeat events in the QPA linux input plugin

Change-Id: Ibbdb74b5fb568153780355c1ebbd9e678b884c22
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
9 years agoFix possible crash issue when testing the state of a QAccessibleMenuItem
Yan Shapochnik [Wed, 11 Apr 2012 19:02:49 +0000 (15:02 -0400)]
Fix possible crash issue when testing the state of a QAccessibleMenuItem

The owner widget of a QAccessibleMenuItem may be NULL. Checking for a valid pointer before dereferncing.

Change-Id: Ic3149ccc5d6ae0ebc83dae58163ae2f60397fd28
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
9 years agoFixes crashes and memory leak in QMacPixmapData
Andreas Loew [Thu, 12 Apr 2012 08:48:11 +0000 (10:48 +0200)]
Fixes crashes and memory leak in QMacPixmapData


Change-Id: I7b4034fae8b3b0ee43eb04ecce3c31479adb3b68
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
9 years agoFixed crash in QImage in out of memory condition
Andreas Loew [Fri, 9 Mar 2012 13:28:14 +0000 (14:28 +0100)]
Fixed crash in QImage in out of memory condition

Change-Id: I64467525d3365903e83b2e7e9cf381dd5a39c2b4
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
9 years agogcc 4.7.0 compatibility fix for javascript
Mark Brand [Fri, 23 Mar 2012 15:29:57 +0000 (16:29 +0100)]
gcc 4.7.0 compatibility fix for javascript

taken from http://qt-project.org/forums/viewthread/15071

Change-Id: I701fb5a8d754afe9fcd6b327d779365673e07b5d
Reviewed-by: Alexis Menard <alexis.menard@openbossa.org>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
9 years agoUpgrading libpng: Patches to libpng 1.5.10 for Qt usage
aavit [Fri, 2 Mar 2012 09:09:10 +0000 (10:09 +0100)]
Upgrading libpng: Patches to libpng 1.5.10 for Qt usage

This is the collection of those earlier patches to libpng
in Qt that are still relevant, updated as required:

Change-Id: I06603041b5971ade4742f600dbea4cca98ff95a5
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
9 years agoUpgrading libpng: Adding clean copy of libpng 1.5.10
aavit [Wed, 11 Apr 2012 08:12:38 +0000 (10:12 +0200)]
Upgrading libpng: Adding clean copy of libpng 1.5.10

This commit removes the previous version of the bundled
libpng (1.5.4), as well as all local modifications to it.
It adds an unmodified copy of the official libpng
source distribution, except that various extraneous
files have been removed, as usual.

The patches required to build it in Qt will follow in
separate commit(s).

Change-Id: I0cfc782a1c1b7f06b92eb1b38992bd8a0e6de08d
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
9 years agoFix initial size of QMainWindow with unified title and toolbar on Mac
Andy Shaw [Wed, 22 Feb 2012 21:17:19 +0000 (22:17 +0100)]
Fix initial size of QMainWindow with unified title and toolbar on Mac

On Mac if the toolbar was hidden in a unified title and toolbar main
window then it would have too much space between the title and the
central widget.

Task-number: QTBUG-24423
Change-Id: I5e434da2447f33795f3771e43b42930824482d8e
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
9 years agoEnsure that the IME composition is handled correctly on Mac
Andy Shaw [Mon, 2 Apr 2012 12:16:45 +0000 (14:16 +0200)]
Ensure that the IME composition is handled correctly on Mac

When the language menu was shown while IME composition was underway, it
would cause the composition text to be in an invalid state.

Task-number: QTBUG-25107
Change-Id: Iaf06f330fb055e30c25ccc9874f15132ea000bc2
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
9 years agoFix memory leak when drawing text in non-common script
Eskil Abrahamsen Blomfeldt [Wed, 11 Apr 2012 08:12:23 +0000 (10:12 +0200)]
Fix memory leak when drawing text in non-common script

When the fontEngine() cached was updated for new parameters, we
would overwrite the cached engine, but not deref the old cached engine,
thus it would never be deleted.

Change-Id: I3b88698712e468ffa634bd98019a7871662cc363
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
9 years agoWidget created with type to Qt::ToolTip should have a drop shadow
Katja [Wed, 22 Feb 2012 12:30:07 +0000 (14:30 +0200)]
Widget created with type to Qt::ToolTip should have a drop shadow

When using Qt::ToolTip window flag, CS_DROPSHADOW style should be used

Task-number: QTBUG-13276

Change-Id: I4b8dfab0de38667188efe6cc8e1465bdf1ae2d18
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
9 years agoAccessibility: send cursor move updates.
Frederik Gladhorn [Mon, 23 Jan 2012 14:03:50 +0000 (15:03 +0100)]
Accessibility: send cursor move updates.

ATs need to be able to react to cursor movement.

Change-Id: I8fbb036b6a180f555505ab529020d0aea2d25e7c
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
9 years agoDo not send QEvent::AccessibilityPrepare.
Frederik Gladhorn [Fri, 23 Mar 2012 13:12:33 +0000 (14:12 +0100)]
Do not send QEvent::AccessibilityPrepare.

This leads to crashes in the unix bridge when notifying
about object destruction.

Task-number: QTBUG-25240
Change-Id: I24069a1c9e63d4c0a1f9b1336b94ab0712ac5ccf
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
9 years agoFixes a regression; missing cursor blink when input mask is set.
Andreas Aardal Hanssen [Thu, 12 Apr 2012 05:46:19 +0000 (07:46 +0200)]
Fixes a regression; missing cursor blink when input mask is set.

I can't say for sure why q*linecontrol passes an empty rect to
the updateNeeded() signal when an input mask is set; presumably
the empty rect at some point has meant "full update", but there
are a few problems with this. Surely a full update is wrong,
even if the semantics have been lost in translation somewhere
(likely the qlinecontrol refactoring). This fix ensures
that empty rects from updateNeeded() are interpreted as a request
to update the whole widget. A further improvement would be to
ensure the line control doesn't request a full update when an
input mask is set. The cursor is usually wider when a mask is
set but because of QLineEdit::paintEvent()'s implementation,
there is currently a mismatch between the cursor width as seen
by q*linecontrol and what is actually drawn, which causes
rendering artifacts if updateNeeded() sends the cursorRect().

Since QLineEdit and Q*LineControl aren't actively developed, it's
best to keep this fix minimal, although the performance cost of
updating the whole line edit when an input mask is set is

cherry-picked from qt5/qtbase a9cda515177db1615f8d47becf2aa781f26955ae

Task-number: QTBUG-7174
Change-Id: Ie51e015d760915e07b0220b770f04fc958d93a12
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
9 years agoQWS: Add support for HomeLocation and TempLocation
Bhooshan Supe [Fri, 6 Apr 2012 19:47:12 +0000 (12:47 -0700)]
QWS: Add support for HomeLocation and TempLocation

There was no implementation for "QDesktopServices::HomeLocation" and
"QDesktopServices::TempLocation" so adding the same.

Change-Id: I6bc58cb83eb64367d8b9eedeea8c43bc4dcad4b6
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
9 years agoUkrainian translation updated
Victor Ostashevsky [Fri, 6 Apr 2012 14:29:57 +0000 (16:29 +0200)]
Ukrainian translation updated

Change-Id: I0eb1aa9cc6c3fd11ca530590cb6052fd69c720f8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoUse QPointer to store accessible object.
Frederik Gladhorn [Tue, 10 Apr 2012 20:58:05 +0000 (22:58 +0200)]
Use QPointer to store accessible object.

Itemview were not following the established pattern
of keeping the referenced object in a QPointer.
This made them a lot more crash prone.

Change-Id: I210b112b9c3647b246fde2d6c69aba9ce8d25bd3
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
9 years agoMake QSslCertificate test fail instead of crash
Shane Kearns [Tue, 10 Apr 2012 14:38:21 +0000 (15:38 +0100)]
Make QSslCertificate test fail instead of crash

If the SSL dlls could not be loaded, then QSslCertificate::fromPath
will return an empty list. Make the test check for this before
triggering an assertion failure by calling first()

Task-number: QTBUG-25229
Change-Id: Ib6280c02130142201016a3f15ddb6bd44bfa0f9f
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
9 years agoFix compilation when QT_NO_CURSOR is defined
Romain Pokrzywka [Mon, 16 Jan 2012 05:53:01 +0000 (23:53 -0600)]
Fix compilation when QT_NO_CURSOR is defined

Change-Id: Iacf8ef2032d5c229a7483d6993120684ee9bb04e
Reviewed-by: Jeremy Katz <jeremy.katz@nokia.com>
9 years agoFind libssl on linux using paths of loaded libraries
Shane Kearns [Wed, 28 Mar 2012 15:06:57 +0000 (16:06 +0100)]
Find libssl on linux using paths of loaded libraries

The installed path of libssl may include an element describing the
architecture, e.g. x86_64-linux-gnu or i386-linux-gnu.
In most cases, the libraries already loaded (static dependencies of
Qt, such as libc) will include the path where libssl is installed.

Use dl_iterate_phdr to find the paths. This is a linux specific
function, but it does provide "/lib/<arch>" and "/usr/lib/<arch>"
at the point ssl symbols are being resolved when running the
qsslsocket autotest (which has less dependencies than a typical
Qt app).

Task-number: QTBUG-24694
Change-Id: I9af8081f41bb85c2fcff450a2acda5672a7f7518
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
(cherry picked from commit e5337ad1b1fb02873ce7b5ca8db45f6fd8063352)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
9 years agoDisconnect slots from the old sourcemodel in QIdentityProxyModel
k.blammo@gmail.com [Fri, 9 Mar 2012 11:29:09 +0000 (12:29 +0100)]
Disconnect slots from the old sourcemodel in QIdentityProxyModel

When setting a new sourcemodel QIdentityProxyModel::setSourceModel
tries to disconnect from signals belonging to the NEW model instead of
from the existing sourceModel(). QIdentityProxyModel thus receives
signals from both the old model(s) and the new model. This results in
ASSERTS triggering in various slots, for example:
"Q_ASSERT(topLeft.isValid() ? topLeft.model() == model : true);"
in QIdentityProxyModelPrivate::_q_sourceDataChanged.

Change-Id: Ic6f65a9ee10981d00206335f2edef78272fadc1a
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
(cherry picked from commit fae4a2555a9402e8cecf67242b29dca624cc61e8)
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
9 years agoqmake vcxproj generator: properly escape XML attributes
Joerg Bornemann [Wed, 4 Apr 2012 16:27:24 +0000 (18:27 +0200)]
qmake vcxproj generator: properly escape XML attributes

Task-number: QTBUG-24954

Change-Id: I21299440ba3f268c2fa1e14d37003cdc3e6a35ad
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 0174c966f734ba48d387257a14447e8b56d85d37)

9 years agoQNAM: close the channel if bytesAvailable and nothing piplined
Martin Petersson [Tue, 10 Apr 2012 12:17:17 +0000 (14:17 +0200)]
QNAM: close the channel if bytesAvailable and nothing piplined

If there are still bytesAvailable on the socket and we have
nothing pipelined we should close the channel. This was not
done before as the chunked decoder did not read the last
CRLF. This has now been fixed so this close should be enabled

Task-number: QTBUG-24875
Change-Id: I2ebdce1094282b055f4fd72ca642887c5f96c43b
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agoFix compilation when QT_NO_CURSOR is defined
Romain Pokrzywka [Mon, 16 Jan 2012 05:55:43 +0000 (23:55 -0600)]
Fix compilation when QT_NO_CURSOR is defined

Although the QtDesigner module isn't built by default on embedded
platforms, it's sometimes needed, mainly for dynamic form loading.
The library contains a couple of setCursor calls  which should then
be #ifdef'd, as it's often a disabled feature for embedded UIs.

Change-Id: I92d91249905848e73ee933e6f057a30b9cacb03c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
9 years agoPlug memory leak when gestures are grabbed but never triggered
Andy Shaw [Wed, 28 Mar 2012 19:54:52 +0000 (21:54 +0200)]
Plug memory leak when gestures are grabbed but never triggered

When a gesture is grabbed by QAbstractScrollArea but never triggered
then the deletion of the QAbstractScrollArea would mean that the gesture
created for it would not be deleted.  This ensures that it always
deletes the gestures waiting to be deleted even if no gesture event is

Task-number: QTBUG-25011

Change-Id: I36118b82baaa60ac4e014896159060e1af76b2d2
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
(cherry picked from commit 3ec88b355b5c9649d128fcf18cb2abc39ac0e770)

9 years agoMade qt_accStripAmp handle "&&"
José Millán Soto [Sun, 22 Jan 2012 18:48:09 +0000 (19:48 +0100)]
Made qt_accStripAmp handle "&&"

Changed qt_accStripAmp implementation to handle texts which contains
pairs of ampersands representing a single ampersand.

In order to do that, a new static function called qt_accAmpIndex was
This function is based on the code of qt_accHotKey, which was changed
to use qt_accAmpIndex.

Change-Id: Idcc5d07581d7fb3251c30399b189740ca8071104
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
9 years agoFixes a problem with the proxy detection on Windows
Thierry [Wed, 28 Mar 2012 18:09:20 +0000 (20:09 +0200)]
Fixes a problem with the proxy detection on Windows

The current scheme is to use IE's default config.
If that fails get the winhttp config.
That's ok. The problem is that if you run a program as a service
getting the IE config will set the fAutoDetect flag.
But later the call to WinHttpGetProxyForUrl mightfail with the
this patch just makes sure that we have a fallback winhttp solution
in case the IE proxy is not set.
The new code detcted if the current process is a service, in which case it
will try to default to the system-wide proxy.

Change-Id: I57e9082a46a8422c54f8f069715752c271a3a001
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agoFixed build failure in tools/qml for Harmattan
Gareth Stockwell [Wed, 14 Mar 2012 14:00:35 +0000 (14:00 +0000)]
Fixed build failure in tools/qml for Harmattan

Change-Id: I6fb26f2da3ff78dd20d06941ae1aedd059f116ff
Reviewed-by: Martin Jones <martin.jones@nokia.com>
9 years agoCall wait() after calling quit() so that it can gracefully finish
Andy Shaw [Wed, 7 Mar 2012 12:08:02 +0000 (13:08 +0100)]
Call wait() after calling quit() so that it can gracefully finish

There was a problem with slow https connections that if the download
was ongoing when quit() was called then it tended to cause a crash
because it tries to shutdown the SSL connection.

Task-number: QTBUG-24594
Change-Id: I6b161bc7a9bb99e41849537462de2d7c92661902
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
(cherry picked from commit 46c58502639c25e5d19dd84d913b1208d5051db5)

9 years agoFix signed/unsigned warnings (QWS)
Sergey Gusarov [Sat, 31 Mar 2012 10:55:51 +0000 (14:55 +0400)]
Fix signed/unsigned warnings (QWS)

Change-Id: I98ba87fa236b1a10ea2499e270e71a94f54c1c3b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
9 years agoFix clang warning
Sergey Gusarov [Sat, 31 Mar 2012 09:35:53 +0000 (13:35 +0400)]
Fix clang warning

In file included from /home/sergey/code/QtEmbedded-4.8.0/include/QtGui/QDirectPainter:1:
/home/sergey/code/QtEmbedded-4.8.0/include/QtGui/qdirectpainter_qws.h:56:1: warning: class 'QWSEmbedEvent' was previously declared as a
      struct [-Wmismatched-tags]
class QWSEmbedEvent;
/home/sergey/code/QtEmbedded-4.8.0/include/QtGui/qwsevent_qws.h:269:8: note: previous use is here
struct QWSEmbedEvent : QWSEvent
/home/sergey/code/QtEmbedded-4.8.0/include/QtGui/qdirectpainter_qws.h:56:1: note: did you mean struct here?
class QWSEmbedEvent;
1 warning generated.

Change-Id: Iebda5efe8547b16e457486166a8abc8479b2fd8d
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
9 years agoUse value of LANG if LC_TIME is empty.
Thomas Sondergaard [Wed, 21 Mar 2012 20:02:30 +0000 (21:02 +0100)]
Use value of LANG if LC_TIME is empty.

Task-number: QTBUG-24912
Change-Id: I68d91c02f5d82b7fc4cae0d2dedafb862a3b323b
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Reviewed-by: John Layt <jlayt@kde.org>
9 years agoFix corelib build for WEC7.
Janne Anttila [Wed, 4 Apr 2012 12:43:48 +0000 (15:43 +0300)]
Fix corelib build for WEC7.

Qt5 backported fix http://codereview.qt-project.org/17852 broke the Qt4.8
build for WEC7. The change works fine in Qt5 because Qt5 does not anymore
have QT_MODULE macro in every header, including qfunctions_wince.h.
See commit: 4ecf8279

Apparently implementations of QT_MODULE and c-language zlib are
not compatible, because MSVC2008 gives a lot of errors like:
    error C2085: 'qt_wince_getenv_s' : not in formal parameter list

Build break fixed by putting QT_MODULE macro inside #ifdef __cplusplus.

Change-Id: Id71386867750fcc61ab2cb2ecc527edc37c943ba
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
9 years agoMove handling of rotation changes from event handler to screen
Kevin Krammer [Tue, 3 Apr 2012 10:34:42 +0000 (12:34 +0200)]
Move handling of rotation changes from event handler to screen

Have the navigator event handler emit the new rotation as a signal argument
and let the screen class handle all parts of the change, i.e. also notifying
the window system about the geometry change.

This also allows to rotate all screens, not just the primary screen, if this
should be necessary.

Backport of 45b7b0599cd1ebdfe17487215b36ff766068f0e8

Change-Id: Ia3e3ff321bc2d7a23e64950d15d88d007f9766dd
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
9 years agoUpdated WebKit to 9c745c625c6d1112cec51d742ecc8c041cc090d7
Simon Hausmann [Tue, 3 Apr 2012 07:43:48 +0000 (09:43 +0200)]
Updated WebKit to 9c745c625c6d1112cec51d742ecc8c041cc090d7

Backport Casper's doc fix from https://bugs.webkit.org/show_bug.cgi?id=82893

Change-Id: I85bd671132fe6e1bb8798960ef0db7f02e10b4b4
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
9 years agoAdd a native interface with the ability to query the window group
Thomas McGuire [Tue, 27 Mar 2012 15:41:00 +0000 (17:41 +0200)]
Add a native interface with the ability to query the window group

The window group is needed by QtMobility, as the BB multimedia
API requires the window group when creating a video overlay

Change-Id: Ifc029c31b5a1750631a6b397f7c33aa31e483c81
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
9 years agoAdd support for screen overlays / foreign windows
Thomas McGuire [Tue, 27 Mar 2012 15:22:25 +0000 (17:22 +0200)]
Add support for screen overlays / foreign windows

We're not the only one creating native windows. When using the
multimedia API, the multimedia library creates a video window
for video display. Here we need to deal with giving this video
window overlay a proper z-order, otherwise it will never get

Cherry-picked from qtbase 4efd61c3cf3d25db1c60bf5c842837c5b24a05fa
Change-Id: If2e2a6e51ae6553fdf645e578f68e41c7b43336a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
9 years agoMake everything in QBBScreen non-static
Thomas McGuire [Mon, 26 Mar 2012 13:50:21 +0000 (15:50 +0200)]
Make everything in QBBScreen non-static

Cherry-picked from qtbase b5f343b3677a7c7f09d91d7d60f310717325e840
Change-Id: Idf7176bd83215f1251c1e2200a5bf0168adfe523
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
9 years agoFix QTcpServer::listen() returning true when the port is in use on OS X.
Robin Burchell [Fri, 30 Mar 2012 19:21:40 +0000 (21:21 +0200)]
Fix QTcpServer::listen() returning true when the port is in use on OS X.

Way back in the mists of time, someone added SO_REUSEPORT to socket binding,
which was great, because otherwise it meant that multiple UDP sockets couldn't
share the same port on OS X (as platforms with SO_REUSEPORT apparently don't
support rebinding with SO_REUSEADDR).

However: SO_REUSEPORT also means that *any* bind on a port will succeed, which
is most definitely not wanted in the case of TCP sockets, so check the socket
type before performing the actual bind.

Also test that multiple listens don't take effect.

Cherry-picked-from: qtbase/master/a84b42e6194be0f40bd8f961effef9947c07c832
Change-Id: I2f8d450bcfb8a7f3abd8918a4e789a850281dd13
Done-with: Thiago Macieira
Done-with: Shane Kearns
Task-number: QTBUG-6305
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agotest: Mark test as insignificant on Mac
Sergio Ahumada [Mon, 2 Apr 2012 11:34:27 +0000 (13:34 +0200)]
test: Mark test as insignificant on Mac

This test only fails on Mac at the moment, so enabling it for
all other platforms.

Change-Id: I7d9ca2152f43e718944c7a0439b633566620795f
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agotest: Mark test as insignificant on Windows
Sergio Ahumada [Mon, 2 Apr 2012 11:07:23 +0000 (13:07 +0200)]
test: Mark test as insignificant on Windows

This test only fails on Windows at the moment, so enabling it for
all the othe platforms.

Change-Id: Ic85e321a369104c590f71e45891ddede208383fb
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agoFix a crash in cursorToX() when new block is added
Jiang Jiang [Mon, 2 Apr 2012 10:32:05 +0000 (12:32 +0200)]
Fix a crash in cursorToX() when new block is added

When an empty new block is being added, the layoutData->memory data
will be 0, thus QTextEngine::attributes() will return 0. We should
only access the attributes pointer when some text actually exist.

Task-number: QTBUG-24718
Change-Id: I9ce9f7b57bccf24099a02832ce30fb6cebfaad33
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
9 years agoMemory leak fix of sqlite driver when close failed
Honglei Zhang [Thu, 8 Dec 2011 12:17:08 +0000 (14:17 +0200)]
Memory leak fix of sqlite driver when close failed

If an ongoing query is not finalized before close function is called,
sqlite driver can't close the connection to sqlite. In this case, the
failure is only reported to the client via getLastError(). Even if the
client want to handle this case, there is no easy way to revoke the
close function. This commit finalizes all queries before
close is called.

Task-number: QTBUG-16967
Change-Id: I069f6073bd46f53780e13d269e44aa86366e0574
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
9 years agoUpdated Russian translation
Sergey Belyashov [Mon, 2 Apr 2012 17:05:28 +0000 (21:05 +0400)]
Updated Russian translation

Change-Id: I149ca83e408d62b240b6ae2f0c5f3ec630b1b709
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoFix platforms.pro scope to match all QNX platforms
Rafael Roquetto [Thu, 29 Mar 2012 13:48:37 +0000 (15:48 +0200)]
Fix platforms.pro scope to match all QNX platforms

cherry-picked from qt5/qtbase: d5bc8ab811f380116c5a55a777150bc47a43a6bb

Change-Id: I8d2f906c52ae56ec5cfce70f94ec3661e7d0e15f
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>