qt:ibingows-qt-ios-plaszma.git
6 years agoMerge remote branch 'qt/4.8' into 4.8 4.8
wang-bin [Tue, 17 Apr 2012 02:19:41 +0000 (10:19 +0800)]
Merge remote branch 'qt/4.8' into 4.8

6 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>
6 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
path.

Task-number: QTBUG-24956

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

6 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>
6 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>
6 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
d63910575949106f84dacf04abaa14fc866aa66b.

Task-number: QTBUG-24965
Task-number: QTBUG-25140
Change-Id: Ice9d90ebb81dcc3c0bc166eeb8f77a0ad9d99476
Reviewed-by: David Faure <faure@kde.org>
6 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
invalid.

Change-Id: I6dd70b53b975b10b75c246e6f8f7681da2bcb785
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
6 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>
6 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>
6 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:

657ca81c910638128f533b7eb98edf187bd40a0c
1c20c3f29441a6856c6eb58dda40b86bdaac6a06

from qtbase.

Change-Id: I2e30a16140eaf417a07674828642b74fc829bda8
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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

QTBUG-24709
QTBUG-24710
QTBUG-24711

Change-Id: I7b4034fae8b3b0ee43eb04ecce3c31479adb3b68
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
6 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>
6 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>
6 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:
d6ba0e805fd2b17e2e0cbbce32e218551505d91f
91bf025444f13eb269ece6bb430a841638bb32a8
125dae45c5c8e09a58409095f6661ab65ea1e71f
d6947bcbed97889d7d56d400f81eb1691a3f18e1

Change-Id: I06603041b5971ade4742f600dbea4cca98ff95a5
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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
unfortunate.

cherry-picked from qt5/qtbase a9cda515177db1615f8d47becf2aa781f26955ae

Task-number: QTBUG-7174
Change-Id: Ie51e015d760915e07b0220b770f04fc958d93a12
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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)

6 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
again.

Task-number: QTBUG-24875
Change-Id: I2ebdce1094282b055f4fd72ca642887c5f96c43b
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
6 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>
6 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
triggered

Task-number: QTBUG-25011

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

6 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
created.
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>
6 years agoMerge branch '4.8' of git://gitorious.org/qt/qt into 4.8
wang-bin [Fri, 6 Apr 2012 18:08:42 +0000 (02:08 +0800)]
Merge branch '4.8' of git://gitorious.org/qt/qt into 4.8

Conflicts:
src/gui/util/qdesktopservices.cpp
src/plugins/platforms/platforms.pro

6 years agouse armv6
wang-bin [Fri, 6 Apr 2012 16:12:53 +0000 (00:12 +0800)]
use armv6

6 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
error code ERROR_WINHTTP_AUTODETECTION_FAILED.
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>
6 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>
6 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)

6 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>
6 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;
^~~~~
struct
1 warning generated.

Change-Id: Iebda5efe8547b16e457486166a8abc8479b2fd8d
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
6 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>
6 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>
6 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>
6 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>
6 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
window

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>
6 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
visible.

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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 years agoFix QFileSystemEngine::tempPath on Blackberry OS
Rafael Roquetto [Wed, 28 Mar 2012 16:12:38 +0000 (18:12 +0200)]
Fix QFileSystemEngine::tempPath on Blackberry OS

Unlike Unix, Blackberry OS stores the location of the temporary directory into
the TEMP environment variable.

Change-Id: I31f50fc4b160e5594339c4fcd62613963cc1484f
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
6 years agolimits.h for PATH_MAX
wang-bin [Sun, 1 Apr 2012 13:19:03 +0000 (21:19 +0800)]
limits.h for PATH_MAX

6 years agoSeparate virtual keyboard interface and implementation
Kevin Krammer [Thu, 29 Mar 2012 13:50:10 +0000 (15:50 +0200)]
Separate virtual keyboard interface and implementation

Allows us to create a BPS based implementation and drop it in
without further changes to users of the interface.

Backport of 831943d7f12addef79fb536e5550da0f72480217

Change-Id: Ib047f4bbc68743cfe8c2293a235d4e9ca8195af9
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
6 years agobackup qws build script
wang-bin [Sat, 31 Mar 2012 16:26:21 +0000 (00:26 +0800)]
backup qws build script

6 years agoBuild for iOS with qpa is ok
wang-bin [Sat, 31 Mar 2012 16:23:40 +0000 (00:23 +0800)]
Build for iOS with qpa is ok

OpenGL ES2.x is enabled
qpa plugin is only minimal

6 years agoTry to build qt-ios for armv7 with my toolchain
wang-bin [Sat, 31 Mar 2012 16:20:48 +0000 (00:20 +0800)]
Try to build qt-ios for armv7 with my toolchain

My toolchain does not support neon

6 years agomisc
wang-bin [Sat, 31 Mar 2012 06:34:57 +0000 (14:34 +0800)]
misc

6 years agoarm config
wang-bin [Sat, 31 Mar 2012 06:02:27 +0000 (14:02 +0800)]
arm config

6 years agoDisable opengl. es2 depends egl. ios sdk does not have it
wang-bin [Sat, 31 Mar 2012 03:25:06 +0000 (11:25 +0800)]
Disable opengl. es2 depends egl. ios sdk does not have it

6 years agoAdd host 64 qmake.conf
wang-bin [Sat, 31 Mar 2012 02:12:43 +0000 (10:12 +0800)]
Add host 64 qmake.conf

6 years agoFix regressions due to partial QSslSocket::peek fix
Shane Kearns [Tue, 27 Mar 2012 19:28:44 +0000 (20:28 +0100)]
Fix regressions due to partial QSslSocket::peek fix

The fix broke HTTPS transactions with chunked encoding.
It also broke use of a QSslSocket in unencrypted mode where peek
and read calls are mixed.
See change 68b1d5c17aa38d5921bdade2b0e0cb67c6c90513.

Change-Id: Ib115b3737b0e4217496f5def10aaaea3c6452ff8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
6 years agoFix compilation error on Solaris caused by ShapeInput
Iikka Eklund [Wed, 28 Mar 2012 11:28:45 +0000 (14:28 +0300)]
Fix compilation error on Solaris caused by ShapeInput

Change: Icb2204a50a97e4a5e02e75301c67287525b290ba caused build error
on Solaris as ShapeInput and ShapeBounding types are not present in
default system headers. This patch is compile time fix for Solaris only.
On Solaris the windowInteractsWithPosition function call is omitted
as suggested by the author of the original change.

Task-number: QTBUG-24653
Change-Id: I29d821867ec41e7d68b5bdc126f255dc682cc983
Reviewed-by: Albert Astals Cid <albert.astals@canonical.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
6 years agoMove screen event processing into its own class
Kevin Krammer [Thu, 29 Mar 2012 11:23:42 +0000 (13:23 +0200)]
Move screen event processing into its own class

The event handler class can then be reused when we have proper
BPS event support available from corelib

Backport of a80a2c6da241dac77f533bc702a1c7d94349a812

Change-Id: I9f8f661ca6b976aa02990bc8c8af8e5472e5faa4
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
6 years agoRefactoring virtual keyboard class into non-singleton
Kevin Krammer [Fri, 23 Mar 2012 16:35:33 +0000 (17:35 +0100)]
Refactoring virtual keyboard class into non-singleton

Getting rid of the singleton gives us better control over when the
virtual keyboard handling class is instantiated and configured.

Also notify screens about keyboard height changes and let them
notify through QWindowSystemInterface instead of "guessing" the
screen in QQnxVirtualKeyboard.

Backport of 5d117fd427e3e727df5d3f417a2b91366f2a31c1

Change-Id: I49c1a6af5decca47a5ab3ba382430a2b25578d40
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
6 years agoFix build error for Blackberry OS QDesktopServices
Rafael Roquetto [Fri, 30 Mar 2012 11:33:42 +0000 (13:33 +0200)]
Fix build error for Blackberry OS QDesktopServices

Add a missing include to qdir.h

Change-Id: Ie24eac38411b1a578e725a62121a55df0e673595
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
6 years agoFix window focusing problem in Symbian
Pauli Jarvinen [Thu, 29 Mar 2012 13:47:50 +0000 (16:47 +0300)]
Fix window focusing problem in Symbian

The application window didn't receive focus properly on Symbian when
minimized window was maximized. This was because the code first tried
to set the focus and then made the window visible. However, invisible
window doesn't accept focus, so the visibility should be set first
and focus only after that.

Not having focus properly set caused software input pane to fail to
start in the Camera application, as was reported in the error case
ou1cimx1#989756.

Change-Id: Id659662e7d92205321746ed5a226843382a6ac89
Reviewed-by: Murray Read <ext-murray.2.read@nokia.com>
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
6 years agotests: Mark unstable test as insignificant on Windows
Sergio Ahumada [Fri, 30 Mar 2012 07:56:02 +0000 (09:56 +0200)]
tests: Mark unstable test as insignificant on Windows

Marked the following tests insignificant due to failures, these need
to be fixed later and then re-enabled:

  tst_qhttpnetworkconnection
  tst_qsharedmemory

Task-number: QTQAINFRA-428
Change-Id: I9b4d5490291799c63ff07cb8bc676c37989a7c6b
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
6 years agoFix link error in x64
wang-bin [Fri, 30 Mar 2012 10:21:59 +0000 (18:21 +0800)]
Fix link error in x64

6 years agoEnable iconv
wang-bin [Fri, 30 Mar 2012 08:19:33 +0000 (16:19 +0800)]
Enable iconv

6 years agolink with opengl es2
wang-bin [Fri, 30 Mar 2012 08:04:00 +0000 (16:04 +0800)]
link with opengl es2

Can not enable qtopengl now, don't know why

6 years agoEnable qfilesystemwatcher
wang-bin [Fri, 30 Mar 2012 08:03:19 +0000 (16:03 +0800)]
Enable qfilesystemwatcher

6 years agoiOS does not have fp.h. include math.h instead
wang-bin [Fri, 30 Mar 2012 08:02:13 +0000 (16:02 +0800)]
iOS does not have fp.h. include math.h instead

6 years agoThe scaling should not effect the width of a cosmetic pen
Andy Shaw [Wed, 28 Mar 2012 07:56:55 +0000 (09:56 +0200)]
The scaling should not effect the width of a cosmetic pen

When the scaling effects the pen width so that it is less than 1 pixel
in width then it would use the QCosmeticStroker to draw, however this
should not be the case for cosmetic pens that are not less than 1 pixel
in width as the scaling does not change their width.

Task-number: QTBUG-25006
Change-Id: I142db0f3a7ee02aa87171495d5a7a7011100814e
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
(cherry picked from commit 6eae3cec5a34fbed28e519ffd8a8f3f1cd7b5c5b)

6 years agoFix link error in x86_64
wang-bin [Fri, 30 Mar 2012 06:08:08 +0000 (14:08 +0800)]
Fix link error in x86_64

ld: symbol dyld_stub_binding_helper not defined (usually in crt1.o/dylib1.o/bundle1.o)
add $${QMAKE_IOS_SDK}/usr/lib/dylib1.o

6 years agoAdd some link flags
wang-bin [Thu, 29 Mar 2012 17:49:42 +0000 (01:49 +0800)]
Add some link flags

-compatibility_version and -current_version

6 years agoMerge branch '4.8' of git://gitorious.org/~ianfromafrica/qt/qt-ios-plaszma into 4.8
wang-bin [Thu, 29 Mar 2012 17:34:32 +0000 (01:34 +0800)]
Merge branch '4.8' of git://gitorious.org/~ianfromafrica/qt/qt-ios-plaszma into 4.8

Conflicts:
mkspecs/common/gcc-base-ios.conf
mkspecs/common/ios.conf
mkspecs/common/ios/arm-arch.conf

6 years agoMerge branch 'linux-ios-g++' into 4.8
wang-bin [Thu, 29 Mar 2012 17:12:02 +0000 (01:12 +0800)]
Merge branch 'linux-ios-g++' into 4.8

Conflicts:
mkspecs/common/gcc-base-ios.conf

6 years agouse the environment var IOS_SDK as default
wang-bin [Thu, 29 Mar 2012 16:15:47 +0000 (00:15 +0800)]
use the environment var IOS_SDK as default

6 years agofix building qmake for iOS error
wang-bin [Thu, 29 Mar 2012 15:28:02 +0000 (23:28 +0800)]
fix building qmake for iOS error

6 years agoarm-apple-darwin9-strip does not suport --strip-unneeded
wang-bin [Thu, 29 Mar 2012 15:23:47 +0000 (23:23 +0800)]
arm-apple-darwin9-strip does not suport --strip-unneeded

6 years agotests: Mark unstable test as insignificant on Windows
Sergio Ahumada [Mon, 26 Mar 2012 07:56:17 +0000 (09:56 +0200)]
tests: Mark unstable test as insignificant on Windows

Marked the following tests insignificant due to failures, these need
to be fixed later and then re-enabled:

  tst_qtextstream

Task-number: QTQAINFRA-428

Change-Id: Id3b6b7c46d981bb64786c0c225f599784304ca4f
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
6 years agoSupport QDesktopServices on BlackBerry platforms
Rafael Roquetto [Wed, 21 Mar 2012 13:46:42 +0000 (14:46 +0100)]
Support QDesktopServices on BlackBerry platforms

Change-Id: I10506b83efda8efb12ccc531f60cd4cd9b4b5bc9
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
6 years agothe last merge is not finished
wang-bin [Thu, 29 Mar 2012 13:10:58 +0000 (21:10 +0800)]
the last merge is not finished

6 years agothe last commit did not merge, shit
wang-bin [Thu, 29 Mar 2012 12:51:58 +0000 (20:51 +0800)]
the last commit did not merge, shit

6 years agoopengl is not ready
wang-bin [Thu, 29 Mar 2012 11:38:43 +0000 (19:38 +0800)]
opengl is not ready

Merge branch 'linux-ios-g++' of gitorious.org:~ibingow/qt/ibingows-qt-ios-plaszma into linux-ios-g++

Conflicts:
mkspecs/common/gcc-base-ios.conf
mkspecs/qws/ios-g++/qmake.conf

6 years agoCan build core, xml, network, sql on linux
wang-bin [Thu, 29 Mar 2012 11:22:11 +0000 (19:22 +0800)]
Can build core, xml, network, sql on linux

6 years agoAdd mkspecs
wang-bin [Thu, 29 Mar 2012 10:22:38 +0000 (18:22 +0800)]
Add mkspecs

Hello Qt and iOS!
TODO: qconfig.h qfeature.h gui

6 years agoCan build core xml network sql in linux toolchain
wang-bin [Thu, 29 Mar 2012 10:22:38 +0000 (18:22 +0800)]
Can build core xml network sql in linux toolchain

Hello Qt!
TODO: qconfig.h qfeature.h gui

6 years agoQNam: try to read the last CRLF when chunked encoding is used.
Martin Petersson [Wed, 28 Mar 2012 14:12:43 +0000 (16:12 +0200)]
QNam: try to read the last CRLF when chunked encoding is used.

When chunked encoding is used we should try to read the last CRLF after
the last zero-lenght chunk, with chunk size coded as 0.

Task-number: QTBUG-19480
Task-number: QTBUG-20924

Change-Id: I39c85f45c329246d6c53c29ba1511039b2503e13
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>