9 years agoRemoving potential crashes from out-of-thread cleanup on Symbian 4.8.1-symbian
Murray Read [Mon, 18 Jun 2012 15:43:19 +0000 (16:43 +0100)]
Removing potential crashes from out-of-thread cleanup on Symbian

There have been some crashes seen on Symbian when its
adoptedThreadMonitor attempts to clean up objects created in other, now
dead, threads. Some of these objects simply can't be cleaned up
properly outside of their original thread, so the thread has to be
checked when they are cleaned up, and cleanup skipped in the wrong

For pthread created threads, we also have the ability to insert cleanup
code during thread shutdown. This was used in the 4.7 implementation of
QThread on Symbian, and is a better solution for pthread based adopted
threads as it gives in-thread cleanup. So the appropriate pthread code
is also used with changes to adoptedThreadMonitor so that it can run
along side the pthread cleanup code.

Change-Id: Iad8207879b1ece62e5cce85f26a616166aa22486
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
(cherry picked from commit 1f9168d3839b2081572368b786c263a04955337c)

9 years agoFix for enter key inserting into password fields in Symbian
Marko Kenttala [Wed, 11 Jul 2012 13:09:05 +0000 (16:09 +0300)]
Fix for enter key inserting into password fields in Symbian

QML TextInput and TextField elements with echoMode TextInput.Password
adds enter key into container string.

Modified filtering in Symbian QCoeFepInputContext to disable adding
enter key for hidden editors.

Task-Number: 1009418
Change-Id: If7928ccdb131d11f8c975b0efe890b85f3ba202e
Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
(cherry picked from commit a9aa74ea6c3fcac9d56d1f2a2926c89d07cade7c)
Reviewed-by: Aapo Haapanen <ext-aapo.haapanen@nokia.com>
9 years agoFix compilation error
Jaakko Helanti [Wed, 4 Jul 2012 13:11:50 +0000 (16:11 +0300)]
Fix compilation error

Gerrit change I0b9f6205ca1521fc54d3b688ccd1225823263aac
is missing two needed header file includes. This task
adds them in.

Change-Id: I210515cef81bc03a5ad76a4bac3a5a50ad28e37d
Reviewed-by: Aapo Haapanen <ext-aapo.haapanen@nokia.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
(cherry picked from commit e2d853299cf383cdfbb6aa25aadd4e34a0a3cdca)
Reviewed-by: Roy Mickos <ext-roy.mickos@nokia.com>
Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com>
9 years agoEnable smiley support for Symbian editors
Marko Kenttala [Thu, 28 Jun 2012 07:43:35 +0000 (10:43 +0300)]
Enable smiley support for Symbian editors

Added enabling of CEikEdwin::EAvkonEnableSmileySupport flag for normal
Symbian editors so that smiley/emoticon button or menu is enabled.

Change-Id: I0b9f6205ca1521fc54d3b688ccd1225823263aac
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
(cherry picked from commit 2da55509d4344ed56ad8243b496398779fc3c98a)
Reviewed-by: Roy Mickos <ext-roy.mickos@nokia.com>
9 years agoAvoid crash cancelling timer in wrong thread on terminate
Murray Read [Wed, 13 Jun 2012 12:06:53 +0000 (13:06 +0100)]
Avoid crash cancelling timer in wrong thread on terminate

When the Symbian timer active object detects that it is cancelled in the
wrong thread, it was issuing a qFatal. But that was an overreaction, as
the situation is not necessarily fatal if the thread in which the timer
lives is about to die. For example if QThread::terminate is used outside
of the thread targeted. Instead a debug message should be issued so that
if there is a crash, the programmer should get information as to why.

The debug message, in this case, is issued with RDebug::Print to avoid
the use of Qt's message output which itself was crashing in partially
finished thread situations.

Task-number: ou1cimx1#1006699
Change-Id: I7d192eb27ba85ba2ef4f80fec3d8479f0df8f90c
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
(cherry picked from commit 8ccf7283a1a90d125a774027c6bc3028ab0d29f7)

9 years agoSymbian: shift package minor version to enable intermediate updates
Pasi Pentikainen [Fri, 15 Jun 2012 09:13:45 +0000 (12:13 +0300)]
Symbian: shift package minor version to enable intermediate updates

Change the Symbian stub and sis package version minor number to be
100 * actual minor number (from 4.8.1 to 4.8.100 now), so that any
potential intermediate sis/iad updates on top of 4.8.0 will be
correctly removed when a new firmware is installed on phone.

Task-number: ou1cimx1#1007333
Change-Id: I2d0ddc8e04e1d8bd0f8bdacab62ceb07edc40647
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
9 years agoSymbian: create stub sis during build
Pasi Pentikainen [Thu, 14 Jun 2012 12:12:50 +0000 (15:12 +0300)]
Symbian: create stub sis during build

Create stub sis during the (tools2) configure step of the Symbian build.
This allows changing of the stub sis package version just by modifying
the qt_stub.pkg file.

Change-Id: I8260fc3db3d6e41926f2217542f84ec93868b65f
Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
(cherry picked from commit a7f0196fe301b962da94563cffc958df220a6c21)

9 years agoPerformance fix for OpenGL drawing
Pauli Jarvinen [Tue, 12 Jun 2012 09:27:19 +0000 (12:27 +0300)]
Performance fix for OpenGL drawing

Excessive calling of glFlush() was causing a performance problem when
QML application was being run in the OpenGL graphics mode. There was an
unnecessary call to glFlush() in the function
QGLWindowSurfaceGLPaintDevice::endPaint(). This function gets called
each time a QPainter instance is destroyed, which may happen several
times per each painted screen frame (at least 4 times per frame can
easily happen). Calling glFlush() from endPaint() is not necessary at
all since it will be anyway called from QGLWindowSurface::flush()
(either directly if single-buffered context is used or indirectly by
swapping buffers if double-buffered context is used).

Task-number: ou1cimx1#957423
Change-Id: I89509d8935ad31cc47bfed41a1900b6bb76c2af8
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
(cherry picked from commit a56ff23fb9e6c33ff97b5b0e8619346797626755)

9 years agoSymbian: Fix cherry-pick merge-conflict failure
Pasi Pentikainen [Fri, 15 Jun 2012 09:48:16 +0000 (12:48 +0300)]
Symbian: Fix cherry-pick merge-conflict failure

Fix merge conflict failure of 2410bc406d3ff10dee2a955f97eb49a8d25d8264,
done when cherry-picking 4d5296d18f3e201daf054d715401a011325e909c
(I4b5b36b1d996b98e659d993969006c61b4440c15) from 4.8 to 4.8.1-symbian

Change-Id: I4b8049b94f55171b3feafff06b431bcf6aa6f3fb
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
9 years agoSymbian: disable OpenVG as default on Symbian emulator builds
Pasi Pentikainen [Tue, 5 Jun 2012 10:04:21 +0000 (13:04 +0300)]
Symbian: disable OpenVG as default on Symbian emulator builds

Symbian emulator shows QML applications badly when OpenVG graphics
system is used. This fix ignores OpenVG graphics system default
configuration when built for emulator target.

Task-number: ou1cimx1#1005008
Change-Id: I63fb89c5074e03fd582bfbbccca55f33473285c3
Reviewed-by: Pauli Järvinen <ext-pauli.p.jarvinen@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
(cherry picked from commit 8393c808e1d9b91c75e408fbcd7f4aacd576333c)
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
9 years agoFix for QEventLoop autotest for Symbian
Marko Kenttala [Thu, 31 May 2012 08:25:06 +0000 (11:25 +0300)]
Fix for QEventLoop autotest for Symbian

Test deliverInDefinedOrder_QTBUG19637 was skipped in Symbian to avoid
crashing. Test crashed because object events could not be processed
in time in slower Symbian devices.

Added waiting for all events to be processed before checking actual
event count.

Task-Number: QTBUG-23974
Change-Id: Idd79d4ec9fe21a4f03f2d9ba2e365abbbc45c9d8
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>
(cherry picked from commit 90eadd0c4b6de7d1ab4ba3472ffb9afe1539194c)

9 years agoQDeclarativeTextInput sends delayed mouse events to input context
Lauri Malmi [Tue, 5 Jun 2012 07:26:06 +0000 (10:26 +0300)]
QDeclarativeTextInput sends delayed mouse events to input context

now forwards also the delayed press events (sent by
QDeclarativeFlickable) to Input context. In case of delayed
event QWidget pointer in QGraphicsSceneMouseEvent parameter
is null and QApplication::focusWidget() is used to obtain
QWidget pointer.

Task-number: ou1cimx1#1001264
Change-Id: Ia595af651c322b0c91f3a2bd93a9ac1111a00cf6
Reviewed-by: Pauli Järvinen <ext-pauli.p.jarvinen@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
(cherry picked from commit f17543a1a70675e104f173ef72a33ddd25eacf8d)

9 years agoQNAM - maintain a weak reference to the QNetworkSession
Shane Kearns [Thu, 31 May 2012 15:09:38 +0000 (16:09 +0100)]
QNAM - maintain a weak reference to the QNetworkSession

When handling signals from the session, a pointer is needed.
Also the QNetworkReplyImpl needs to access the manager's session.
So, the manager should have a strong and weak reference.
The strong reference is held during connection establishment.
The weak reference is held all the time, though it will become
null when the session is destroyed in idle.
The non static member function getNetworkSession() is used to
create strong references from the weak reference where required.

Task-number: ou1cimx#1004278
Change-Id: I4b5b36b1d996b98e659d993969006c61b4440c15
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
(backported from commit bae1613c4c3d8c38b90ed2ba5c1b149e1bc87987)
(cherry picked from commit 4d5296d18f3e201daf054d715401a011325e909c)
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
9 years agoTrack active network replies without qFindChildren
Shane Kearns [Wed, 30 May 2012 16:08:16 +0000 (17:08 +0100)]
Track active network replies without qFindChildren

For bearer management to work correctly, we need to know when there
are no network replies active. Previously this was implemented
using qFindChildren, but that doesn't work when the user reparents
QtWebkit does this (actually sets parent to 0).
Also the qFindChildren implementation was racy if multiple requests
were finished in parallel. Again, likely to be triggered by webkit
loading page elements.

Task-number: QTBUG-15812
Change-Id: I181a9ba6611c7c4b6fffa2d84fe4029d89e8f596
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
(cherry picked from commit 3580168c3e357c2289acddc5f2515a3ad306ef2b)
(cherry picked from commit bd501eeebfad5ed8fe6d29a9c2c0a26f844bef58)
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
9 years agoFix dangling pointer issue in QGraphicsItem focus handling
Pauli Jarvinen [Wed, 30 May 2012 10:09:46 +0000 (13:09 +0300)]
Fix dangling pointer issue in QGraphicsItem focus handling

When focused QGraphicsWidget is being hidden, it tries to move the
focus to next focusable widget by calling focusNextPrevChild(true). If
there is no such widget available, the focus is cleared altogether.

The logic used to rely on the return value of focusNextPrevChild to
decide if clearing the focus is necessary. This was incorrect because
the return value may be true also when the focus has actually moved
within the graphics widget in question rather than moving to the next
widget. This is the case at least when GraphicsWebView item is
focused. Thus, the focus could then be left on invisible item which was
a serious issue: elsewhere in the qgraphicsitem.ccp, it is assumed that
no visible item can point to invisible item with its subFocus pointer.
Such pointers will become dangling pointers once the pointed
graphicsitem is deleted, and the process will then crash as soon as the
focus is tried to be moved to another item.

Now, the logic has been modified so that it is explicitely checked
after call to focusNextPrevChild if the item being hidden still has
the focus. If this is the case, the focus is cleared. To be consistent,
the same logic is applied also when disabling a QGraphicsWidget. Having
focus on disabled item is not as severe issue as having it on invisible
item, but it is still wrong.

Task-number: ou1cimx1#995710
Change-Id: Ica32bc381befc3ccaac79fb4cf4d50c5d452fad0
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
(cherry picked from commit cf6d24bee40dfff2711990dc61e04aa8193d89cf)

9 years agoSymbian: inputcontext reports pointer events to FEP during inline edit
Lauri Malmi [Tue, 15 May 2012 06:54:25 +0000 (09:54 +0300)]
Symbian: inputcontext reports pointer events to FEP during inline edit

QCoeFepInputContext::mouseHandler() must report pointer events to FEP
by calling CAknExtendedInputCapabilities::ReportEventL(
Based on this event FEP commits inline edit properly and sends
notification peninputserver/VKB. Earlier QCoeFepInputContext::
mouseHandler() called CCoeFep::CancelTransaction() direclty
which lead to inconsistent inline edit state between FEP and VKB.

Task-number: ou1cimx1#991638
Change-Id: I90641ffd5aed97b27f2ca2328c0296e14b12f319
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
(cherry picked from commit 11a1383d54fd479c4fb3d2a96b847732a01dcce8)
Reviewed-by: Lauri Malmi <ext-lauri.malmi@nokia.com>
9 years agoClicking on a disabled ListView's delegate breaks mouse interaction
Pasi Pentikainen [Fri, 4 May 2012 14:47:55 +0000 (17:47 +0300)]
Clicking on a disabled ListView's delegate breaks mouse interaction

A disabled Flickable should not filter children.
This is a backport of change I9f0d8fbfd0922b5c6a9eaffa69212867359f79e0,
from Qt5 (later discarded in QtQuick1 restructuring of Qt5).

Task-number: QTBUG-20584
Change-Id: Id279907ee90faf19284c12b548467850662a7019
Reviewed-by: Martin Jones <martin.jones@nokia.com>
(cherry picked from commit 0f73af96c8ac823761f6ad4f364ce346688e4621)
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
9 years agoConnect bearer engines to manager with QueuedConnection
Shane Kearns [Fri, 27 Apr 2012 10:31:58 +0000 (11:31 +0100)]
Connect bearer engines to manager with QueuedConnection

This is to avoid a deadlock that happens when a user thread is
accessing the QNetworkConfigurationManager at the same time the
plugin emits a signal.

plugin is holding engine lock
user thread is holding manager lock and blocked trying to acquire
the engine lock
In the manager slot, it tries to acquire the manager lock.

By using queued connection, there are no locks held at the time the
manager slot is called.

Change-Id: I95f28028b5e77f77b2b9b7e31cbd1b78a8fe3097
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
(cherry picked from commit 8f026689d57fa282a7d71174d053e8f4c146e418)
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
9 years agoUse reference count to close down idle network session
Shane Kearns [Fri, 27 Apr 2012 18:31:37 +0000 (19:31 +0100)]
Use reference count to close down idle network session

QNetworkAccessManager was using the AutoCloseConnection property
of QNetworkSession to close it when idle. However this property is
only implemented for polling engines and not event driven engines.

Instead, release the network session reference.
If another request comes in, it will be resurrected from the shared
session weak reference.
If not, then after 2 minutes when the connection caches are flushed
the ref count will reach zero and cause the QNetworkSession to be
destroyed (which closes it)

Task-number: QTBUG-15812
Task-number: ou1cimx1#997006
Change-Id: I2963bdf13fb02e3ac269489ea463669142f3c5f3
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
(cherry picked from commit 1aeaf0e7089c893a927a5ab311a6176aad5874a7)
(cherry picked from commit aef97ec5e684f75e4f4e36da1ac321270a1ae2f3)
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
9 years agoSymbian: fix AlignedBlockAllocator initialization on emulator
Pasi Pentikainen [Mon, 7 May 2012 15:54:55 +0000 (18:54 +0300)]
Symbian: fix AlignedBlockAllocator initialization on emulator

Correction to assert in AlignedBlockAllocator contructor. It had a typo,
leading to assert against uninitialized data, which succeeded in all
other environments, except in emulator urel version (which zeroes heap

Task-number: ou1cimx1#998546
Change-Id: I9b8a76f1871287263483cfe09b1e962570f9990d
Reviewed-by: Pauli Järvinen <ext-pauli.p.jarvinen@nokia.com>
Reviewed-by: Murray Read <ext-murray.2.read@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
(cherry picked from commit 51f6e634fdd3b58ef0586e5f2b754b7fbba6b52c)

9 years agoAdd missing colon to tests/auto/auto.pro
Roy Mickos [Wed, 2 May 2012 12:32:23 +0000 (15:32 +0300)]
Add missing colon to tests/auto/auto.pro

The pro file has a missing colon in the last line regarding help.pro.
Although the intent was to exclude it from symbian compilation, the
missing colon caused that it was dropped from all platforms. This
fix will bring it back, while still excluding it from symbian.

Change-Id: I3cf05505d969182556458272cf10bc8847476468
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
(cherry picked from commit b14450aeb393acd6c951241d073947a178ccbc36)

9 years agoFix for clipped Vietnamese characters when typed with VKB
Marko Kenttala [Fri, 20 Apr 2012 13:14:23 +0000 (16:14 +0300)]
Fix for clipped Vietnamese characters when typed with VKB

Adding tone marks with VKB to Vietnamese vowels caused them to be
clipped from top.

Added character conversion to Symbian VKB handling so that correct
characters without clipping are used.

Task-Number: ou1cimx1#981433
Change-Id: Iaf9f2ce9f5cf42e74cac100658025eb6e20e6487
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
(cherry picked from commit 6e5d6d292ba6bcd686367077228b17d02160bee9)

9 years agoFix Symbian key event code mapping in QSymbianControl
Riikka Inkila [Fri, 4 May 2012 07:06:46 +0000 (10:06 +0300)]
Fix Symbian key event code mapping in QSymbianControl

Symbian key events that represent characters/symbols whose Unicode
values are above the value range of S60 special keys are currently
mapped incorrectly to S60 special key events within
QSymbianControl class.
This must be fixed as Symbian AknFEP can nowadays deliver character
input from virtual keyboards to FEP-aware text editors only by
simulating a corresponding key event and virtual keyboards can
obviously contain characters and symbols whose Unicode values
are above the S60 special key value range.

Task-number: ou1cimx1#979068
Change-Id: I57c4e87f6a532641ece7d45f29d3956ebb25b736
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
(cherry picked from commit 46048bd1c8e3a6b9e50f6f37bfd7a454b17f9c65)

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>
(cherry picked from commit 35aff3e7adf6235dd69bcb8cbc5a03947aded863)

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>
(cherry picked from commit 85fac4c2239a024dfeff0561c4f07c2737eb961a)

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>
(cherry picked from commit 3a4acb35029efb1d1f5a0e8d24ddd5838f8f89b9)

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>
(cherry picked from commit 2e897ab99413bb1e4fd3f057f431785e3ac7abb0)
Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.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>
(cherry picked from commit 94df302a8d62c995dedadce0f9a9519a158fd369)

9 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>
(cherry picked from commit 621f18955082fc73471e75d1f8c35c2dcd4befeb)
Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
9 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

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>
(cherry picked from commit 8582f7c16a2f9c3915c19df5bc31af598d1e3701)

9 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>
(cherry picked from commit 2cfc2a2e9af97a2799e76868e4c6b302d55266e0)
Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
9 years agoGive QThread threads better names on Symbian
Murray Read [Mon, 26 Mar 2012 13:02:10 +0000 (14:02 +0100)]
Give QThread threads better names on Symbian

QThread sets the name of a Symbian thread that it creates. This name
can appear in a number of debugging scenarios, and it can give useful
information. However the existing name set by QThread has not been

This change improves the amount of information in the thread name.
Threads are now named as:
    <object name>_<class name>_v=<class vptr>_<random>
The class name and vptr can be used to identify the QThread subclass
type. In the case of a QThread subclass that generates a .moc file,
the class name will be the true class name. However for other cases,
eg where QThread is used directly, or is subclassed without a QOBJECT
declaration, the name may simply be "QThread", and the vptr field
might then be more informative.

This change also allows the use of RTTI to get the true class name,
through a rebuild of Qt, defining the macro name
QT_USE_RTTI_IN_THREAD_CLASSNAME. This is not enabled by default, as
there may be Symbian cases where RTTI does not work.

Task-number: QTBUG-24950
Change-Id: Ifae9c6cb64638e95a01d34e421aa36f6fd0e7444
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
(cherry picked from commit f33ad9d6548d4544ad2ea6229b47093efa9ea0ef)
Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
9 years agoFix TypeError
sh kim [Fri, 23 Mar 2012 05:32:00 +0000 (14:32 +0900)]
Fix TypeError

A example has errors about TypeError

Change-Id: Ie6e9c769e83c5a3410c1131383c50dfedb828c41
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
(cherry picked from commit dc13840ca95d453be239d2f4e10ef9f2edaf6c3a)
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
9 years agoSymbian: Support for apps on previous symbian release
Satyam Bandarapu [Mon, 27 Feb 2012 09:20:40 +0000 (11:20 +0200)]
Symbian: Support for apps on previous symbian release

Behaviour of API QKeyEvent::text is changed between Belle and
forthcoming releases in Symbian. This Fix is needed to support
the legacy Apps.

Task-number: ou1cimx1#978743
Change-Id: I87a9aa2e3d87cf61708196204dce00de4393011e
Reviewed-by: Murray Read <ext-murray.2.read@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
(cherry picked from commit 7be97ebddb27d570c6bcbe8ad881d890ea6a5d2d)

9 years agoFix performance problem with NTLM auth in http POST
Shane Kearns [Thu, 22 Mar 2012 15:10:26 +0000 (15:10 +0000)]
Fix performance problem with NTLM auth in http POST

A combination of other fixes resulted in authentication credentials
with a blank username & password being incorrectly added to the
cache only for NTLM.
This caused authentication to be attempted with blank credentials
first (which would fail), before the authenticationRequired
signal was emitted.
It caused a performance issue because of the extra 2 requests to the
server (and possibly delays inserted by the server following a failed

Task-number: ou1cimx1#985786
Change-Id: Ic588a20cfe7c24d5e60cd384caff0673a587e484
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
(cherry picked from commit 3c3ea9a869086ebb02a5d0c475754f6a184a50ab)

9 years agoSymbian: drop OpenGL ES in non-supported hardware
Pasi Pentikainen [Wed, 21 Mar 2012 14:42:17 +0000 (16:42 +0200)]
Symbian: drop OpenGL ES in non-supported hardware

When hardware configuration has no OpenGL ES 2 support indicated, leave
OpenGL ES out of Qt compilation alltogether.

Task-number: ou1cimx1#987609
Change-Id: If43a8de059596fbdb52c97535436c441760c97ab
Reviewed-by: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
Reviewed-by: Jani Hautakangas <jani.hautakangas@nokia.com>
9 years agoMake QNX virtual keyboard handling main event loop driven
Kevin Krammer [Thu, 22 Mar 2012 16:46:17 +0000 (17:46 +0100)]
Make QNX virtual keyboard handling main event loop driven

Refactor from polling in an endless loop running in a separate thread
to using a QSocketNotifier working on the main thread.

Backport of 29518b04a619fdd7784e88eebe687fb87ae8a8b5

Change-Id: I8993b874f1543d5e85b0911c81a7a9ec072e5160
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
9 years agoqmake: fix default value for C++ optimization in vcxproj files
Joerg Bornemann [Thu, 22 Mar 2012 11:27:23 +0000 (12:27 +0100)]
qmake: fix default value for C++ optimization in vcxproj files

For the debug configuration the optimization should be turned off.

This is the completion of the backport of

Task-number: QTBUG-23421

Change-Id: Ibf30d1e27b3b614bd4b1304d21be76af3faf0249
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
9 years agoUse main thread event loop for navigator event processing
Kevin Krammer [Tue, 20 Mar 2012 12:55:50 +0000 (13:55 +0100)]
Use main thread event loop for navigator event processing

Removes the need for an extra thread by creating the event handler's
socket notifier in the context of the main thread.

Backport of 9dc86ac0f2d019f93665c1ae0e3c2cd33fd88bce

Change-Id: I5c31d904191f45698085e8fd576481018e072ef4
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
9 years agoDisable the use of sed on native mingw
Hib Eris [Wed, 21 Mar 2012 10:16:09 +0000 (11:16 +0100)]
Disable the use of sed on native mingw

Partially reverts 28f294e1e98f2437ce0d9614e698df7c8dc52dc6

Commit 28f294e1e98f2437ce0d9614e698df7c8dc52dc6
introduced the use of 'sed' to do replacements for mingw in
pkgconfig files, similar to what is done for unix.

However, this causes corrupted pkgconfig files when 'sed' is not
available. While on Unix we can safely assume that 'sed' is always
available, it appears that when building on Windows with mingw
'sed' might not be available.

As it would be too complicated for the 4.8 branch to add support
for automatic 'sed' detection, this patch chooses to completely
disable the use of 'sed' for all mingw builds on Windows.

For cross compiled builds 'sed' is still used.

Change-Id: I8b6b3f52df6906cd087dd3eb417bdb5800e8eafc
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoSilence warnings about va_list mangling for QNX toolchain
Sean Harmer [Mon, 19 Mar 2012 13:28:41 +0000 (13:28 +0000)]
Silence warnings about va_list mangling for QNX toolchain

Backport of 2d5a4a5d3aae4efe7c17cadf03dfbb5cc4c36e86 from qtbase.

Change-Id: Id8453fdd40c88acd27f2ddd932a5a410382e1b67
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agorebuild configure
Oswald Buddenhagen [Mon, 19 Mar 2012 16:49:47 +0000 (17:49 +0100)]
rebuild configure

Change-Id: Iecd72971c2cb825cfb4d1ab3c0110feb9df1f854
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
9 years agocompile without rtti
Oswald Buddenhagen [Thu, 9 Feb 2012 17:47:37 +0000 (18:47 +0100)]
compile without rtti

no point in it

Change-Id: Id6ad95c197095131c6c100afe37b3d48adb157d1
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit dc810b81a38a2a4d33f6909ff213809e1bf384ca)

9 years agoremove pointless include paths
Oswald Buddenhagen [Thu, 9 Feb 2012 17:43:14 +0000 (18:43 +0100)]
remove pointless include paths

we rely on a syncqt'd tree anyway

Change-Id: I23b288b98a5e9289993b058f7dce02e19564c67a
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit 946501ab350f0c3dbaf163c03415f459efb8c6bd)

9 years agoproperly enable stl via qmake instead of hacking compiler flags
Oswald Buddenhagen [Thu, 9 Feb 2012 17:41:21 +0000 (18:41 +0100)]
properly enable stl via qmake instead of hacking compiler flags

Change-Id: I2c037c9a28043afe53167a766bce7c9d09b8f3a3
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit cb03577711a7dddd6444c0f6114fbf3785552353)

9 years agobuild with QT_NO_GEOM_VARIANT
Oswald Buddenhagen [Thu, 9 Feb 2012 17:40:26 +0000 (18:40 +0100)]

saves us some pointless code

Change-Id: I24e4fe4107f44ab579c0f951551c4138713a749f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit 2091d4c33a0f20e44f64ecf9953bb7725ceed287)

9 years agoadd missing errno.h include
Oswald Buddenhagen [Wed, 8 Feb 2012 09:55:49 +0000 (10:55 +0100)]
add missing errno.h include

it was masked by the precompiled header

Change-Id: I9ba7b0faa716cfa6844b9a9f81fa2a3aa67f5da4
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit 2b969b89b95317f04bd562aee3528cab227e57b8)

9 years agoremove bizarre magic from precompiled header
Oswald Buddenhagen [Wed, 8 Feb 2012 09:21:28 +0000 (10:21 +0100)]
remove bizarre magic from precompiled header

it doesn't serve any puropse (any more?) and it breaks the mingw build.

Change-Id: I02a5e7502586e7e9f5956991498ff602eff66e81
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit 0678a7db8e8eb6997b0acb106dd4347ef8c76fbe)

9 years agoBackported linux-g++-maemo mkspec changes from Qt5
Gareth Stockwell [Thu, 15 Mar 2012 11:37:28 +0000 (11:37 +0000)]
Backported linux-g++-maemo mkspec changes from Qt5

This change factors out common configuration for Linux ARM targets
into a subsiduary mkspec which is included by linux-g++-maemo.

Cherry-picked from qtbase commit 3f09c6a1762db9ea05f3815235ac0937d004ee9e

Change-Id: I9d7852e8b2e891217c3bee2964cddfef526d1d5f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoDoc Fix- a QML MouseArea Elelment can accept 5 buttons.
Rick Stockton [Mon, 19 Mar 2012 22:10:36 +0000 (15:10 -0700)]
Doc Fix- a QML MouseArea Elelment can accept 5 buttons.

Add XButton1 AND Xbutton2 to the list of accepted Buttons.
This is only a doco fix, without any code change.

On branch 4.8

Change-Id: Ib396ec7707a63123759f1164927f0b63850cebe9
Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
9 years agoTGA imageformat: fix broken canRead plugin function
Alexander Anokhin [Thu, 15 Mar 2012 08:05:31 +0000 (12:05 +0400)]
TGA imageformat: fix broken canRead plugin function

Plugin is now moving QIODevice pos to 0 before
exiting from canRead function, so it doesn't break
other existing imageformat plugins functionality.

Task-number: QTBUG-24201
Change-Id: Ib58b0458215cf5ad705dffa0aaf6a7463d1f089e
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
9 years agoFix bug in qsslsocket peek()
Kalle Viironen [Thu, 26 Jan 2012 10:33:47 +0000 (12:33 +0200)]
Fix bug in qsslsocket peek()

Calling peek() for qsslsocket caused socket data to be copied into
qiodevices buffer and therefore make it unaccessible in qsslsocket.

Task-number: QTBUG-18498
Change-Id: Ie27a90a468be8158bd8afcd259dbb34483623c36
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agoCherry picking qt5 bugfix 437da962c2b486b1a1722aac003bfa00b93ac204 to qt4.
Arnt Witteveen [Mon, 19 Mar 2012 11:23:29 +0000 (12:23 +0100)]
Cherry picking qt5 bugfix 437da962c2b486b1a1722aac003bfa00b93ac204 to qt4.

Original description for bugfix:
Fix bug showing folder icons for files

Fix an issue where the cache was updated with the folder icon,
even though this is never used from the cache. This caused
files to sometimes be shown with a folder icon: If a folder
has an extension (e.g. a folder named 'folder.ext'), this
means the folder icon will be written to the cache for the
'ext' extension, and from that point on all .ext files will
be shown with the folder icon.

The fix is to not save an icon in the cache for those cases
where it will not be used from the cache anyway, by using the
same condition for updating the cache as for reading it (which
is in line 8 of the same function).

Change-Id: I349526ff017b1a2409e3dcc494b86bb541740790
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
9 years agoFixed MSVC2011 build
Eugene Shcherbina [Tue, 6 Mar 2012 14:27:38 +0000 (18:27 +0400)]
Fixed MSVC2011 build

It consists of 2 fixes:
1. JavaScriptCore fix is relevant to changed ctor of the std::pair in
C++11. Due to that change some code has been broken. Fix makes using
std::pair compliant to both standards
2. Clucene is broken in MVS2011 due to changed stdext::hash_map which
is used as the ancestor in inner CLucene classes. It ended up with
names collision and double inheritance from the one base class.
Fix reflects that change.

Change-Id: I77a1fe4b137480b51c24267b7aacb5b688dbddb3
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Kervala <kervala@gmail.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
9 years agoFix QDeclarativeItem::hasActiveFocus().
Andreas Aardal Hanssen [Wed, 7 Mar 2012 19:26:17 +0000 (20:26 +0100)]
Fix QDeclarativeItem::hasActiveFocus().

This function returns true if the item (or, in case it's a focus
scope, one of its children,) has focus (i.e., will
receive key events now), or will receive focus once the scene is
activated. It also returns true if the item has not yet been added
to a scene, but has subFocus, implicating that someone has called
setFocus() on it prior to it being added to the scene; the latter
case seen most commonly in unit tests.

Cherry-picked from qt/qtquick1: bb364c14157df635cf166b293f8cab6c22534aa1

Task number: QTBUG-24681

Change-Id: I2f2d9dd81820e94202a44393a38972c868a774b7
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
9 years agoUpdate the links in the titlebar of Online HTML template.
Casper van Donderen [Fri, 16 Mar 2012 12:34:01 +0000 (13:34 +0100)]
Update the links in the titlebar of Online HTML template.

The links were still pointing to old URLs, this change changes the
links to point to qt-project.org

Change-Id: Ie0b7b5aef693c54174e5400d6a16bdbfb540c763
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
9 years agoBump Qt version to 4.8.1 for Symbian specific files also
Juha Kukkonen [Fri, 16 Mar 2012 08:02:12 +0000 (10:02 +0200)]
Bump Qt version to 4.8.1 for Symbian specific files also

This continues work done in commit "Bump Qt version to 4.8.1"
8ced172dd250277f38cc3d2753692cda0fa183da by updating version number
to Symbian specific files also.

Updated Qt version to 4.8.1 in pkg files and ROM stub file.

Task-number: ou1cimx1#987442
Change-Id: Ia71dff65956453a0eceb4b8ebba187289f20eebf
Reviewed-by: Murray Read <ext-murray.2.read@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agoRemoving Symbian fast allocator implementation
Murray Read [Wed, 7 Mar 2012 11:02:14 +0000 (11:02 +0000)]
Removing Symbian fast allocator implementation

An implementation of the Symbian fast allocator was added to Qt
before it was available in all Symbian devices, to allow Qt
the benefit of it in all installations.

Now it is available in all Symbian devices and there is no
need to keep a copy in Qt. So it is being removed to simplify
the code.

Task-number: ou1cimx1#946699
Change-Id: I937faca61beb4ef66a858766ebfa3deff564c786
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agoCrash in Symbian text codec creation without CleanupStack
Murray Read [Thu, 15 Mar 2012 15:41:25 +0000 (15:41 +0000)]
Crash in Symbian text codec creation without CleanupStack

The Symbian text codec is creating a CCnvCharacterSetConverter with its
NewL() function. This requires the CleanupStack, otherwise you get a
E32USER-CBase 69 panic. But sometimes apps have been using text streams
and other objects in static data construction or destruction which
use the text codec where there is no CleanupStack.

This change detects is a CleanupStack is present and temporarily creates
one if not.

Change-Id: Ia68fa60b4f0e3d675ee302208a625c6e9493a6f1
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agoMake sure QGlobalNetworkProxy is created for QNetworkProxy.
Xizhi Zhu [Thu, 15 Mar 2012 10:00:14 +0000 (11:00 +0100)]
Make sure QGlobalNetworkProxy is created for QNetworkProxy.

Otherwise, you don't have any socket engine handler created when
directly setting a proxy to a socket.

Cherry-picked from Qt5 / QtBase commit:

Change-Id: Id87a13cf496553e85ca1f92f0cb5093752f3f5f5
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agoFix compiling qvfb on Linux/X11
Pasi Petäjäjärvi [Mon, 27 Feb 2012 10:16:41 +0000 (12:16 +0200)]
Fix compiling qvfb on Linux/X11

Qvfb fails to compile on linux.
Fixed by removing duplicate source and header file inclusion from
qvfb.pro file when embedded flag is not set in CONFIG.

Task-number: QTBUG-19804

Change-Id: I09278c8042204f913ca2c2bbdee4d4163fae213d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
9 years agoHandle -sysroot option in configure script
Gareth Stockwell [Mon, 12 Mar 2012 12:12:51 +0000 (12:12 +0000)]
Handle -sysroot option in configure script

Although the code for processing a sysroot was already present,
the -sysroot command-line option was ignored.

Change-Id: Idde473d4b5f9cf3d56b508c71614d4cbc0248492
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoFixed compiler warnings about unused q and d pointers.
Janne Anttila [Wed, 2 Nov 2011 07:29:20 +0000 (09:29 +0200)]
Fixed compiler warnings about unused q and d pointers.

The q and d pointers were not used in these functions at all, or they
were used only inside some #ifdef quard such as QT_NO_ACCESSIBILITY.
Moved the Q_D and Q_Q macros inside the appropriate scope.

Task-number: QTBUG-22512
Change-Id: I1624a1d800c7ce21cde4af1678d93e6f615edd45
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
9 years agoWEC7 build fix - use ptrdiff_t from std namespace.
Janne Anttila [Fri, 18 Nov 2011 09:44:46 +0000 (11:44 +0200)]
WEC7 build fix - use ptrdiff_t from std namespace.

WEC7 does not have ptrdiff_t outside std namespace, switched to use
ptrdiff_t from std namespace correspondingly as OwnArrayPtr.h does in

Task-number: QTBUG-22502
Change-Id: I5c2ffd271cccd12c1fcdca3975ace3e8224e00bf
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
9 years agoFix generating the qdoc3 manual in 4.8
Casper van Donderen [Wed, 14 Mar 2012 12:24:57 +0000 (13:24 +0100)]
Fix generating the qdoc3 manual in 4.8

There were some qdoc errors when generating the qdoc manual. This change
fixes thoise qdoc errors.

Change-Id: I9e12abbc6688f0fefc3534d830d581a80f5b973a
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
9 years agoUpdate the footer for qdoc output for qt-project.
Casper van Donderen [Tue, 13 Mar 2012 15:29:05 +0000 (16:29 +0100)]
Update the footer for qdoc output for qt-project.

Change-Id: I6518c03715cd485330a6550bd62d385477a45c7a
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
9 years agoFixes potential memory leak in qtextcodec.cpp
Nick Ratelle [Thu, 5 Jan 2012 22:13:46 +0000 (17:13 -0500)]
Fixes potential memory leak in qtextcodec.cpp

cherry-picked from qt5/qtbase 4560ea230f40
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Change-Id: I06fc265fcc34bcc671c44b7041c0c461e588d193
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
9 years agoFix q_atomic_decrement for 64-bit Solaris
Samuli Piippo [Mon, 12 Mar 2012 13:53:06 +0000 (15:53 +0200)]
Fix q_atomic_decrement for 64-bit Solaris

q_atomic_decrement and q_atomic_increment did not set return value
correctly. They expected the %eax return value register to be empty,
when it was not necessarily so.

This could occur when when compiler inlined e.g.,
~QByteArray -> QBasicAtomicInt::deref -> q_atomic_decrement
chain to application code. Data would not to be freed and leak memory.

Fixed so that %eax is now zero'd before setting return value.

Task-number: QTBUG-24470
Change-Id: I83495e3ddb938713863a7b00714215c331b9562b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
9 years agoHarfbuzz-thai - fix buffer overflow when setting item attributes
John Tapsell [Mon, 12 Mar 2012 22:07:47 +0000 (22:07 +0000)]
Harfbuzz-thai - fix buffer overflow when setting item attributes

Change-Id: I19eeb4ec25a7c6cb3f584e6290169f9f327b8713
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
9 years agoFix documentation error
Shane Kearns [Wed, 7 Mar 2012 15:34:23 +0000 (15:34 +0000)]
Fix documentation error

The function wasn't introduced in 4.8, we just documented its
behaviour properly in that release.

Change-Id: I0560be978612eaed4e632ea191c4b2ba19b4e7a8
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
9 years agoOptimise QFile::seek that doesn't move the file pointer
Shane Kearns [Thu, 8 Mar 2012 11:45:05 +0000 (11:45 +0000)]
Optimise QFile::seek that doesn't move the file pointer

If the seek position matches the current file position, then
avoid doing an implicit flush that could be expensive.

Change-Id: I019858ffb36fe832b9aee8da0a7803cafc8f7f75
Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
9 years agoHarfbuzz GPOS hinting- do not consider a subtable to be invalid if it is just empty
John Tapsell [Thu, 8 Mar 2012 23:10:30 +0000 (23:10 +0000)]
Harfbuzz GPOS hinting- do not consider a subtable to be invalid if it is just empty

Considering a subtable to be invalid when it was empty meant that it
returned an error causing all further hinting to be aborted.  This means
that we get no hinting in certain cases with certain fonts.

Change-Id: I840c016dc85935b4f2c4373c66a79b4bd8b3a30d
Reviewed-by: Adrian Yanes <ext-adrian.yanes@nokia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
9 years agoRemoved invalid assert in BMP loader code.
Kim Motoyoshi Kalland [Thu, 8 Mar 2012 14:34:22 +0000 (15:34 +0100)]
Removed invalid assert in BMP loader code.

Task-number: QTBUG-24505

Change-Id: Icec4d2c06175e29c5995399d0584c1ca76dc39d2
Reviewed-by: aavit <qt_aavit@ovi.com>
9 years agoImprove type detection for query results
Andy Shaw [Fri, 3 Feb 2012 22:35:14 +0000 (23:35 +0100)]
Improve type detection for query results

When an aggregate function is used for a column in a SQL resultset then
it should ensure that the right data type is reported for that column.
This also concerns expressions when the returned column does not map
directly to a table column.

Test included for this.

Task-number: QTBUG-22038
Change-Id: I681297accc979081d14b44d190ab9d5f83aac215
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
(cherry picked from commit 678ab52ccba0b6a6903e9aee404dbe84fb74c91d)

9 years agoHang on to the correct screen index in QWidget
Nick Ratelle [Tue, 7 Feb 2012 18:18:23 +0000 (13:18 -0500)]
Hang on to the correct screen index in QWidget

Hang onto the screen index that this widget should be
placed on in case the platform cannot move the window onto the screen yet,
when window is not yet created and the plugin cannot access the topData
to update the screenIndex. When this variable is later referenced
after the window is created, it defaults to screenIndex 0,
so the window is never moved correctly.

Change-Id: Ica78fd90aa3dacc29f81b2f6bd6c8b45d2fb2961
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
9 years agoSupport changing locales at runtime in QPA plugins.
Nick Ratelle [Tue, 17 Jan 2012 23:05:54 +0000 (18:05 -0500)]
Support changing locales at runtime in QPA plugins.

Change-Id: Id65798b81db2fa9fb5b1d929e4a94103995c6707
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
9 years agoFixes mismatching delete operator
Rafael Roquetto [Fri, 9 Mar 2012 11:19:15 +0000 (12:19 +0100)]
Fixes mismatching delete operator

cherry-picked from qt5/qtbase 657f634c0e8a1bf4f544b

Change-Id: I35cbdd6fa947a98a6afa70bdc72631c4213c288a
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
9 years agoFixed wrong iconv_open call under QNX
Rafael Roquetto [Fri, 9 Mar 2012 11:05:45 +0000 (12:05 +0100)]
Fixed wrong iconv_open call under QNX

The wrong macro logic was causing iconv_open to never be
called under QNX.

cherry-picked from qt5/qtbase 8a15c41d36b1905a2

Change-Id: I0a1e3fb01d726daca637f8f51abfc924cd493311
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
9 years agomkspecs: don't forget to add 'qnx' when building for x86
Marc Mutz [Fri, 9 Mar 2012 14:23:39 +0000 (15:23 +0100)]
mkspecs: don't forget to add 'qnx' when building for x86

When building for the QNX/x86 target, we forgot
to add the 'qnx' tag to CONFIG. This causes
failures when third-party libraries using qmake
try to scope on qnx.

This change mirrors what's in the ARM target.

Change-Id: I28e1df4d8636385c5555a2bb4087d26a8a9b4220
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
9 years agoRework QNetworkProxyFactory::systemProxyForQuery autotest
Shane Kearns [Fri, 9 Mar 2012 15:01:04 +0000 (15:01 +0000)]
Rework QNetworkProxyFactory::systemProxyForQuery autotest

Rather than requiring specific hardcoded proxies in the system,
it now checks the proxies returned by the system have the required
capabilities for the request.

Note the test will pass if no proxy is configured (as
QNetworkProxy::NoProxy has all required capabilities)

The test prints the returned proxy lists and elapsed time
diagnostic for manual comparison and debugging.

Change-Id: I621ef4d1d7264a98c3e8bd485c30bc1166fcbdf0
Task-number: QTBUG-19454
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 3c529933612ff022d139975d661e37c77b1b2e99)
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agoWindows - handle both auto detect proxy settings together
Shane Kearns [Wed, 22 Feb 2012 20:24:58 +0000 (20:24 +0000)]
Windows - handle both auto detect proxy settings together

If both "automatically detect settings" and "use automatic configuration
script" are selected in internet options, then respect that.
Because of performance issues, these are tried separately, and
disabled if they fail.

Task-number: QTBUG-13957
Task-number: QTBUG-10238
Change-Id: Ibc824d3039afeaf12c5ea82ed95287e5cf4e1776
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
(cherry picked from commit 4cc8209998c386a4372f10496f0c97f3d86f92bb)

9 years agoFix a number of bugs with windows system proxies
Shane Kearns [Mon, 27 Feb 2012 15:59:48 +0000 (15:59 +0000)]
Fix a number of bugs with windows system proxies

TcpServer requests always returned no proxy, even if socks was available
Tag handling was broken for empty tag (if system proxies were tagged)
Tag handling was broken for unknown tags - now handled the same as if
    no tag was given at all.
When there are different proxies for http and https, windows returns
the http proxy first. However we should prefer to use the https proxy
for general sockets, as it's more likely to support the CONNECT method.

Change-Id: I55dcadf2e142367e857f94e55fdbb0c4ddb513a3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
(cherry picked from commit ea92d02b6ba873c10153dc6ab7472edf07f99f03)

9 years agoWindows - fall back on static proxy config if autoproxy fails
Shane Kearns [Wed, 22 Feb 2012 21:20:46 +0000 (21:20 +0000)]
Windows - fall back on static proxy config if autoproxy fails

If both manual proxy settings are configured and the autodetect
setting is enabled, fall back on the manual configuration when
auto detection fails.

Task-number: QTBUG-10428
Change-Id: If008c7c967eec6256ce3c614fff0ec258190d451
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
(cherry picked from commit 276f64d21d7b877044fddd646b855829950099b0)

9 years agoWindows - handle proxy autoconfiguration resulting in no proxy
Shane Kearns [Wed, 22 Feb 2012 20:20:27 +0000 (20:20 +0000)]
Windows - handle proxy autoconfiguration resulting in no proxy

The PAC file may result in direct connection, in which case
WinHttp returns null strings for the proxies and the connection
type marked as direct.
In this case, return the default list (no proxy)

Change-Id: I601033f56a841bb92ea80a28174bb993b024ad79
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 25c05ce3bb8b53ed937363492b8222ee3b83d749)
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agoWindows - fix proxy types for manually specified proxies
Shane Kearns [Wed, 22 Feb 2012 20:11:28 +0000 (20:11 +0000)]
Windows - fix proxy types for manually specified proxies

When the windows internet options are used to specify a
different proxy for each protocol, assume the proxy server type
matches that protocol too.
e.g. "socks=qt-test-server:1080" is both tagged for socks, and
assumed to be a socks server.
"ftp=qt-test-server:2121" is assumed to be an ftp proxy
"ftp=http://qt-test-server:3128" is overridden to be a http proxy
used for ftp.

Task-number: QTBUG-10502
Change-Id: I70615c89d6ede53f0e7d62e6d0754b90d042aa2e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit a7489b2ba3f2f3ea28d6fff0c835c12b0666af45)
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agoWindows - fix QWindowsSystemProxy global static race
Shane Kearns [Wed, 22 Feb 2012 21:23:48 +0000 (21:23 +0000)]
Windows - fix QWindowsSystemProxy global static race

Loser of the race would try to delete an uninitialised pointer

Task-number: QTBUG-15765
Change-Id: Ie184ee2306e102aa8fbad752ef09b95c3ede00c2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 2cf8e487a5c546382daaa954c23d3926668b0a85)
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agoBlackBerry Plugin: support 8 mouse buttons, instead of just 3.
Kevin Krammer [Fri, 9 Mar 2012 07:44:24 +0000 (08:44 +0100)]
BlackBerry Plugin: support 8 mouse buttons, instead of just 3.

The mask of possible mouse buttons in QNX provides tracking for the
up/down State of up to 8 mouse buttons. This update adds support
or 2 of buttons which we previously ignored in Qt on this Platform.

Backport of a0933f4d7485d22f38b80c67f79b8d3f721b19a2 in Qt5/qtbase
reduced to the 5 buttons Qt4 has support for

Related to task-number: QTBUG-24682

Change-Id: I4253b96b2d7ed3f806749432b2eb7f884fd0f580
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
9 years agoUse QSocketNotifier instead of sleeping in an endless loop
Kevin Krammer [Thu, 8 Mar 2012 11:15:41 +0000 (12:15 +0100)]
Use QSocketNotifier instead of sleeping in an endless loop

Event driven listening for navigator events, basically a backport of
the respective QPA plugin code in Qt5/qtbase

Change-Id: I120a755af614d35a9e5a0e755c521bbf8bf0d13d
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
9 years agoFixes codecs.pri to reflect new QNX mkspec name
Rafael Roquetto [Fri, 9 Mar 2012 10:52:21 +0000 (11:52 +0100)]
Fixes codecs.pri to reflect new QNX mkspec name

Change-Id: I7d22d48b189e8abfd6164a51b1e025360ef3da5a
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
9 years agoFix platforms.pro to match new qnx mkspec name
Rafael Roquetto [Thu, 8 Mar 2012 10:58:32 +0000 (11:58 +0100)]
Fix platforms.pro to match new qnx mkspec name

cherry-picked from Qt5/qtbase 4ba895a86

Change-Id: Ic15d00df4b83d4510ea9622d74e988515fbfbae5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
9 years agoRenaming QNX mkspecs v4.8.1
Rafael Roquetto [Wed, 7 Mar 2012 07:53:14 +0000 (08:53 +0100)]
Renaming QNX mkspecs

Renamed from blackberry-* to qnx-* in order to match he <platform>-<compiler>

cherry-picked from qt5/qtbase 6e58dd34ac96e2cf0807a227caaef74d15e272e7

Change-Id: I793af8d1a2053ccf37aaefd5849267797d0ee021
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoEnable storage of global Qt settings in app-local settings file on Mac
Pasi Matilainen [Fri, 2 Mar 2012 13:06:08 +0000 (15:06 +0200)]
Enable storage of global Qt settings in app-local settings file on Mac

The Mac App Store has limitations on where applications can write their
settings, and com.trolltech.plist is not allowed. Changed the settings
code to store all settings in the app-local file when the application
runs in sandbox, or when the application's Info.plist contains a key
"ForAppStore" with value "yes". The application's bundle identifier is
also used for naming the settings file in these cases.

Task-number: QTBUG-16549
Change-Id: Idd2241fbd7eb346da987226f05460642b0d6e5a3
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
9 years agoDon't allow app panic on QProcess destruction, kill or terminate
Murray Read [Wed, 7 Mar 2012 11:47:41 +0000 (11:47 +0000)]
Don't allow app panic on QProcess destruction, kill or terminate

QProcess destruction will call kill() if the process is still running.
PRocess::Kill() and Terminate() both require the PowerMgmt capability
to operate on Symbian, otherwise a KERN-EXEC 46 panic happens.

An app should be able to use QProcess safely if it doesn't have
PowerMgmt capability, it should just be prevented from trying to kill
the created process. Now a debug message is issued on ~QProcess(),
kill() or terminate() if the capability is not present, rather than
actually trying to kill/terminate the process.

Task-number: ou1cimx1#985227
Change-Id: I3242ca2c39528c70c2c79e39f6a6384dd72f6ae6
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agoWindows - fix getsockopt calls for narrower than int options
Shane Kearns [Mon, 20 Feb 2012 18:48:10 +0000 (18:48 +0000)]
Windows - fix getsockopt calls for narrower than int options

Windows unhelpfully writes to only one byte of the output buffer
when getsockopt is called for a boolean option. Therefore we have
to zero initialise the int rather than initialising to -1 as was
done before.
This in general only works for little endian architecture, because
the word would look like 0x01000000 on big endian. So I have added
some compile time asserts in the assumption that windows is always
little endian. This is ok for comparisons with 0/false, but not
comparisons with true or nonzero values.

Task-number: QTBUG-23488
Change-Id: I3c586d1ada76465fc045a82661f289920c657a4c
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
(cherry picked from commit 46e4a9d5231e2d9e35424259858713ca539b8e30)

9 years agoFix for QTBUG-21466: References to deprecated mouse drivers
Pasi Petäjäjärvi [Mon, 27 Feb 2012 11:10:56 +0000 (13:10 +0200)]
Fix for QTBUG-21466: References to deprecated mouse drivers

References to deprecated and removed mouse and keyboard drivers in
documentation. Removed references.

Task-number: QTBUG-21466

Change-Id: I0ea9db679023a5e9a60663d64a9797df4310e662
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
9 years agoescape *_script_file usages in MingwMakefileGenerator::writeObjectsPart
Max Desyatov [Tue, 6 Mar 2012 14:18:53 +0000 (16:18 +0200)]
escape *_script_file usages in MingwMakefileGenerator::writeObjectsPart

(cherry picked from qtbase commit 9d5e721e96f19812a766a4c7d3f8b41f455f507c)
Task-number: QTBUG-24595
Change-Id: I761e4ffb0e473c35784cf1ba5289a79dae5a012b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoMake qget manual test compile without ssl support
Shane Kearns [Mon, 20 Feb 2012 16:40:55 +0000 (16:40 +0000)]
Make qget manual test compile without ssl support

Change-Id: I35f92328b79df1cfcae52fa6ff8290f260183aea
Reviewed-by: Richard J. Moore <rich@kde.org>
(cherry picked from commit 3fe79f23a97323521eb0182f8b46b0d0fc9ce44b)

9 years agoFix error handling in QHostInfo windows backend
Shane Kearns [Fri, 17 Feb 2012 15:14:01 +0000 (15:14 +0000)]
Fix error handling in QHostInfo windows backend

If the DNS server returns a non authoritative host not found response,
then windows returns WSATRY_AGAIN error code.
This is now reported as HostNotFound and not UnknownError

Change-Id: I212985acd4e85ff4b2bdb6c57ec403405a7695fb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
(cherry picked from commit 844b096d674c3b803923357502435ef89ce0c738)

9 years agoMove qws/qnx-* mkspec files from unsupported
Samuli Piippo [Thu, 1 Mar 2012 13:53:34 +0000 (15:53 +0200)]
Move qws/qnx-* mkspec files from unsupported

As QNX in now a supported platform, move mkspec files
away from unsupported folder.

Change-Id: I31f806b5d5217cfb0420dc74dc7a5eea33c1598d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoPrevent stack corruption when using OpenGL Core Profile on Windows
Sean Harmer [Mon, 5 Mar 2012 11:32:09 +0000 (11:32 +0000)]
Prevent stack corruption when using OpenGL Core Profile on Windows

This is the backport of commit


to qtbase.

Change-Id: I8680c20c8b804fb4e77062f52b8f4188b49263a8
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>