qt:qt.git
5 years agoChange all shmget calls to user-only memory 4.7
Thiago Macieira [Sat, 22 Dec 2012 16:32:12 +0000 (08:32 -0800)]
Change all shmget calls to user-only memory

Drop the read and write permissions for group and other users in the
system.

Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876
(cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5)
Reviewed-by: Richard J. Moore <rich@kde.org>
(cherry picked from commit 20b26bdb3dd5e46b01b9a7e1ce8342074df3c89c)

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

OpenSSL changed the layout of X509_STORE_CTX between 0.9 and 1.0
So we have to consider this struct as private implementation, and use
the access functions instead.

This bug would cause certificate verification problems if a different
version of openssl is loaded at runtime to the headers Qt was compiled
against.

Task-number: QTBUG-28343
Change-Id: I47fc24336f7d9c80f08f9c8ba6debc51a5591258
Reviewed-by: Richard J. Moore <rich@kde.org>
(cherry picked from commit eb2688c4c4f257d0a4d978ba4bf57d6347b15252)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoChange copyrights from Nokia to Digia
Sergio Ahumada [Wed, 14 Nov 2012 21:50:41 +0000 (22:50 +0100)]
Change copyrights from Nokia to Digia

Change copyrights and license headers from Nokia to Digia

Change-Id: Ie6697ab48e42676c1d782b8d0075ade1269f45dd
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoChange licenses and license headers from Nokia to Digia
Sergio Ahumada [Wed, 14 Nov 2012 20:36:43 +0000 (21:36 +0100)]
Change licenses and license headers from Nokia to Digia

Change copyrights and license headers from Nokia to Digia

Change-Id: I5fbe31f29f13cf0bb190e52036e2954ec20c40b9
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
6 years agoDisable SSL compression by default.
Richard Moore [Tue, 18 Sep 2012 21:06:15 +0000 (22:06 +0100)]
Disable SSL compression by default.

Disable SSL compression by default since this appears to be the a likely
cause of the currently hyped CRIME attack.

This is a backport of 5ea896fbc63593f424a7dfbb11387599c0025c74
from qt5.

Change-Id: I8fd01c2a230804d88ffa4599e7fd9293a8af9e0f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
6 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 (5.0): bb364c14157df635cf166b293f8cab6c22534aa1

Task number: QTBUG-24681

Change-Id: Ia1265158108d5d856b57e34a8efee2545cd0deeb
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
6 years agoFix memory leak in QDomDocument entity text expansion
Sami Rosendahl [Thu, 19 Jan 2012 08:16:27 +0000 (10:16 +0200)]
Fix memory leak in QDomDocument entity text expansion

The created entity node's reference count needs to be decremented to 0
before it is added as a child, because appendChild will increment the
reference count to correct value of 1. Re-enabled commented-out test
data of tst_QDom::setContent to exercise the code path with the leak.

Change-Id: Ia77b81e4f02cd29c7cd82430a21db5b882bdbfc2
(cherry picked from commit d3145bf9c72951e08e3d574c3bdc7bdf435c8281)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
6 years agoFix memory leak in QDomDocument DTD entity declaration handler
Sami Rosendahl [Thu, 19 Jan 2012 08:15:08 +0000 (10:15 +0200)]
Fix memory leak in QDomDocument DTD entity declaration handler

The created entity node's reference count needs to be decremented to 0 before it is
added as a child, because appendChild will increment the reference count to correct
value of 1. Also added autotest DTDEntityDecl to tst_qdom to expose the leak when
executed under valgrind memcheck. There was no previous direct test case for unparsed
entity declarations in DTD, only indirect coverage via regression test
cloneDTD_QTBUG8398.

Task-number: QTBUG-22587
Change-Id: I0380cd37f65cb5a820e6b792f47e10ae31a465ad
(cherry picked from commit d8d4dc8599fb251ca201f5c3f496df1045d288c3)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
6 years agoFix memory leak in QDomDocument DTD notation declaration handler
Sami Rosendahl [Thu, 19 Jan 2012 08:14:05 +0000 (10:14 +0200)]
Fix memory leak in QDomDocument DTD notation declaration handler

The created notation node's reference count needs to be decremented to 0 before it is
added as a child, because appendChild will increment the reference count to correct
value of 1. Also added autotest DTDNotationDecl to tst_qdom to expose the leak when
executed under valgrind memcheck. There was no previous test coverage for the notation
declarations in DTD.

Task-number: QTBUG-22588
Change-Id: Id211567a5eb9f5552e03756394f994866729dcff
(cherry picked from commit fb38e3801724471a9fb0ea3b412e631223250c44)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
6 years agoFix mouse wheel page-by-page scrolling on windows
Pasi Pentikainen [Mon, 13 Feb 2012 17:59:23 +0000 (19:59 +0200)]
Fix mouse wheel page-by-page scrolling on windows

In windows, the page-by-page mouse wheel scrolling is configured with
scroll lines value of -1, which maps to INT_MAX. The scroll calculations
had an integer overflow issue which caused the wheel scrolling to scroll
only downwards when configured with large enough value like this.

Task-number: QTBUG-11336
Change-Id: Ib4440367ce2617f96797c1f8cc8ec9e6a2f8467c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Andrew Semenenko
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
(cherry picked from commit 21b9d81d527f100e25a4c6dedaf423cdd8f6827c)

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integration
Qt Continuous Integration System [Fri, 30 Dec 2011 11:32:53 +0000 (21:32 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
  Doc: Add `-xunitxml' option to qtestlib documentation

6 years agoDoc: Add `-xunitxml' option to qtestlib documentation
Sergio Ahumada [Thu, 29 Dec 2011 21:41:09 +0000 (22:41 +0100)]
Doc: Add `-xunitxml' option to qtestlib documentation

Task-number: QTBUG-14305
Reviewed-by: Casper van Donderen
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Fri, 16 Dec 2011 13:53:16 +0000 (23:53 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix crash in positionInLigature

6 years agoFix crash in positionInLigature
Jiang Jiang [Fri, 16 Dec 2011 13:21:49 +0000 (14:21 +0100)]
Fix crash in positionInLigature

Check boundary of pos before accessing attributes.

Task-number: QTBUG-23104
Reviewed-by: Eskil
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 7 Dec 2011 13:15:39 +0000 (23:15 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny

6 years agoFix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny
Sami Rosendahl [Wed, 7 Dec 2011 12:57:18 +0000 (13:57 +0100)]
Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny

Several crash backtraces point to crash in QHttpNetworkReply::readAny,
where d->connection==0. This patch adds a check for d->connection to
QNetworkAccessHttpBackend. If the connection is found to be destroyed,
the request is finished.

Does not need to be merged to 4.8 because the internals have changed
(Peter Hartmann)

PMO 290352

Merge-request: 1491
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Wed, 30 Nov 2011 19:35:57 +0000 (05:35 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix HarfBuzz Thai character SARA AM handling

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 30 Nov 2011 14:36:08 +0000 (00:36 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Reduce unnecessary QtCore DLL loads during Symbian app thread creation

6 years agoReduce unnecessary QtCore DLL loads during Symbian app thread creation
mread [Wed, 30 Nov 2011 13:18:11 +0000 (13:18 +0000)]
Reduce unnecessary QtCore DLL loads during Symbian app thread creation

The Symbain fast allocator integration in Qt 4.7 loads QtCore.DLL to
check availablility. This load has been causing a crash in the Nokia
Store app when a different version of QtCore 4.7 is installed. The new
DLL is loaded and it's static data tries to initialise before the
allocator is set up.

This change stores the allocator setup function so that extra DLL loads
are not required. Now the same allocator setup function is used for the
lifetime of the app.

Reviewed-by: Shane Kearns
6 years agoFix HarfBuzz Thai character SARA AM handling
Jiang Jiang [Wed, 16 Nov 2011 14:27:28 +0000 (15:27 +0100)]
Fix HarfBuzz Thai character SARA AM handling

This patch is contributed by Thanomsub Noppaburana from libthai. It
added a special thai shaping function to handle SARA AM character
for fonts without OpenType rules to support it, like Nokia Pure Text
AS.

With modification to logClusters assignment to make sure that
QTextLine::glyphRuns(int from, int length) returns correct glyphs.

Task-number: QTBUG-21206
Change-Id: I5a78ee1ab2b4c874c7d0df17d4ee6d264ed5a790
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integration
Qt Continuous Integration System [Tue, 15 Nov 2011 09:23:02 +0000 (19:23 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
  tests: allow unstable tests to be marked with CONFIG+=insignificant_test

6 years agotests: allow unstable tests to be marked with CONFIG+=insignificant_test
Rohan McGovern [Thu, 19 May 2011 01:42:31 +0000 (11:42 +1000)]
tests: allow unstable tests to be marked with CONFIG+=insignificant_test

Marking a test with CONFIG+=insignificant_test will cause the exit code
of the test to be discarded during `make check'.  This is intended to be
used for tests which are valuable to run, but are known to be unstable
and are not feasible to immediately fix.

Reviewed-by: Jason McDonald
Change-Id: I50a712c33c2ebb0af39f1ea0bf2adef7f0936425
(cherry picked from commit b0a5a988900b777cb08012408eb108512a3e873b)

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Tue, 15 Nov 2011 05:34:48 +0000 (15:34 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Fix focusScopeItemChange setting crash

6 years agoFix focusScopeItemChange setting crash
Damian Jansen [Tue, 15 Nov 2011 04:01:13 +0000 (14:01 +1000)]
Fix focusScopeItemChange setting crash

Delay focusScopeItemChange to after reparenting, to prevent
an invalid focusScopeItem pointer crash.

Task-number: QTBUG-21640
Reviewed-by: Martin Jones
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Fri, 11 Nov 2011 12:39:08 +0000 (22:39 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd

6 years agoFix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd
Sami Rosendahl [Fri, 11 Nov 2011 12:17:54 +0000 (13:17 +0100)]
Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd

If a HTTP server responds with gzip-encoded empty content without defining
Content-Length in the response header QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd
will crash because it calls zlib inflateEnd for an uninitialized stream.

- Fixed the crash by adding a check if the stream is initialized to gunzipBodyPartiallyEnd.
- Added a regression test tst_QNetworkReply::nb279420gzipNoContentLengthEmptyContentDisconnect

PMO 279420
Task-number: QTBUG-22660

Signed-off-by: Sami Rosendahl <sami.rosendahl@reaktor.fi>
Merge-request: 1465
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 9 Nov 2011 03:34:23 +0000 (13:34 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  symbian - handle path being passed as part of filename in QTranslator
  Symbian - fix compile error when default configured

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Tue, 8 Nov 2011 03:05:43 +0000 (13:05 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Compile when -no-rtti is specified as a configure option
  Ensure that the RC_FILE is correctly handled in a single configuration

6 years agosymbian - handle path being passed as part of filename in QTranslator
Shane Kearns [Mon, 7 Nov 2011 15:42:42 +0000 (15:42 +0000)]
symbian - handle path being passed as part of filename in QTranslator

Although incorrect API usage, this was a regression from 4.7.3 behaviour

Task-number: QTBUG-22489
Reviewed-by: mread
6 years agoSymbian - fix compile error when default configured
Shane Kearns [Mon, 17 Oct 2011 14:57:31 +0000 (15:57 +0100)]
Symbian - fix compile error when default configured

New code assumed building with OpenGL/OpenVG, which is the
production configuration, but not the default configuration

Reviewed-By: Jani Hautakangas
Task-Number: QTBUG-21996

6 years agoCompile when -no-rtti is specified as a configure option
Andy Shaw [Fri, 4 Nov 2011 17:35:41 +0000 (18:35 +0100)]
Compile when -no-rtti is specified as a configure option

After discussing with Marko who did the original backport of the
ShaderEffect to Qt 4.7 it was agreed that this is the correct thing to
do in this case.

Merge-request: 2713
Task-number: QTBUG-22419
Reviewed-by: Marko Niemelä
6 years agoEnsure that the RC_FILE is correctly handled in a single configuration
Andy Shaw [Mon, 7 Nov 2011 10:58:04 +0000 (11:58 +0100)]
Ensure that the RC_FILE is correctly handled in a single configuration

With MSVC 2010 if a single configuration vcxproj file was created then
it would not have an entry for the .rc file only the .res file that
would be compiled from it.  Without the entry for the .rc file then it
would not compile the .res file.

Task-number: QTBUG-22545

Merge-request: 1452
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Fri, 28 Oct 2011 10:32:43 +0000 (20:32 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Symbian - disable memory mapping in QNetworkDiskCache

6 years agoSymbian - disable memory mapping in QNetworkDiskCache
Shane Kearns [Fri, 28 Oct 2011 10:20:07 +0000 (11:20 +0100)]
Symbian - disable memory mapping in QNetworkDiskCache

The implementation of memory mapped files in Open C requires
munmap to be called from the same thread as mmap. As the
QIODevice can be handed off to another thread, this breaks
application code that works on other operating systems.

Task-number: QT-5309
Reviewed-by: Tadaaki Matsumoto
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
Qt Continuous Integration System [Thu, 27 Oct 2011 10:35:53 +0000 (20:35 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
  Fix security problem on webpage due to bad JS
  Accepting predicted text using hardware keyboard replaces unwanted part
  Doc: adding link to the Qt Quick Components for Symbian page.

6 years agoMerge remote-tracking branch 'upstream/4.7' into 4.7
Sergio Ahumada [Thu, 27 Oct 2011 10:29:33 +0000 (12:29 +0200)]
Merge remote-tracking branch 'upstream/4.7' into 4.7

Conflicts:
src/gui/inputmethod/qcoefepinputcontext_s60.cpp

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 27 Oct 2011 05:51:05 +0000 (15:51 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Adding items to a view with no delegate crashes.

6 years agoAdding items to a view with no delegate crashes.
Martin Jones [Thu, 27 Oct 2011 05:22:45 +0000 (15:22 +1000)]
Adding items to a view with no delegate crashes.

If there is no delegate then clear state and return.

Change-Id: I786b9bc4018706797056fbd1ad25d25663102707
Task-number: QTBUG-22379
Reviewed-by: Andrew den Exter
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integration
Qt Continuous Integration System [Fri, 21 Oct 2011 21:22:24 +0000 (07:22 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
  Doc: Fix example code

6 years agoDoc: Fix example code
Sergio Ahumada [Fri, 21 Oct 2011 21:15:05 +0000 (23:15 +0200)]
Doc: Fix example code

Task-number: QTWEBSITE-281

6 years agoMerge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Fri, 21 Oct 2011 14:44:38 +0000 (00:44 +1000)]
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team

* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
  Fix security problem on webpage due to bad JS
  Accepting predicted text using hardware keyboard replaces unwanted part

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Fri, 21 Oct 2011 11:48:39 +0000 (21:48 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Regression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504

6 years agoRegression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504
Sami Merila [Fri, 21 Oct 2011 11:40:28 +0000 (14:40 +0300)]
Regression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504

After 2be143ebb5246bb2f9b674bb09d23df5b2b6c504, if user opts to spell
a word him/herself instead of using the suggested word list, the
result is incorrect. The existing preedit string is committed,
then cursor is moved to the beginning and user written word is
added. E.g. user writes 'tadaa' then selects to spell it again and
writes 'radar', in editor there is 'radartadaa'.

Regression is caused due to storing the cursor pointer even in cases
where there is no stored preedit string.

Task-number: QTBUG-22147
Reviewed-by: Miikka Heikkinen
6 years agoFix security problem on webpage due to bad JS
Casper van Donderen [Fri, 21 Oct 2011 10:14:58 +0000 (12:14 +0200)]
Fix security problem on webpage due to bad JS

Reviewed-by: Trust Me
6 years agoAccepting predicted text using hardware keyboard replaces unwanted part
Sami Merila [Thu, 20 Oct 2011 13:46:12 +0000 (16:46 +0300)]
Accepting predicted text using hardware keyboard replaces unwanted part

Current implementation of Symbian input context assumes that predicted
word replacement happens so that the original typed text is at the end
of the surrounded text. The logic fails, if to-be-predicted text is
in the middle of, or in the beginning of another, already accepted
word.

As a fix, input context need to store the original cursor position,
when reset() was called (this happens when word selection list
appears). Input context is already storing a copy of a preedit string
in this situation.

Then, when word replacement happens, this stored cursor position is
used instead of current cursor position (the native side might
temporarily move the cursor to the end when word selection list opens
or closes) to replace the typed word with one selected from suggested
word list.

Stored cursor position is dismissed immediately after used, or
if cached preedit string is dismissed.

Task-number: QTBUG-22147
Reviewed-by: Miikka Heikkinen
6 years agoMerge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Fri, 21 Oct 2011 09:43:04 +0000 (19:43 +1000)]
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team

* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (40 commits)
  Doc: adding link to the Qt Quick Components for Symbian page.
  Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4
  Workaround to VideoCore III scissor bug.
  Fix to QGLWidget crash
  Update def files
  Fix crash on exit when overriding signal handlers in states.
  Typo fix
  Add new signals to indicate GPU resource usage.
  symbian - search drives for translation files
  symbian - search drives for translation files
  Cannot flick to the end of a horizontal list view width LayoutMirroring
  Backport more imports directory caching changes.
  Symbian - fix deleteLater not working from RunL
  Doc updates to installation, platform notes and symbian introduction.
  Do not let QGLContext get out of sync when doing mixed VG-GL rendering
  Fix more test DEPLOYMENT statements for Symbian
  Create auto test for http HEAD request
  QNAM - fix poor performance of HEAD request with authentication
  Fix deployment for declarative tests, examples on Symbian
  symbian - add support for ELangKazakh and ELangEnglish_India
  ...

6 years agoDoc: adding link to the Qt Quick Components for Symbian page.
Jerome Pasion [Wed, 19 Oct 2011 08:43:24 +0000 (10:43 +0200)]
Doc: adding link to the Qt Quick Components for Symbian page.

Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 20 Oct 2011 13:57:37 +0000 (23:57 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Accepting predicted text using hardware keyboard replaces unwanted part

6 years agoAccepting predicted text using hardware keyboard replaces unwanted part
Sami Merila [Thu, 20 Oct 2011 13:46:12 +0000 (16:46 +0300)]
Accepting predicted text using hardware keyboard replaces unwanted part

Current implementation of Symbian input context assumes that predicted
word replacement happens so that the original typed text is at the end
of the surrounded text. The logic fails, if to-be-predicted text is
in the middle of, or in the beginning of another, already accepted
word.

As a fix, input context need to store the original cursor position,
when reset() was called (this happens when word selection list
appears). Input context is already storing a copy of a preedit string
in this situation.

Then, when word replacement happens, this stored cursor position is
used instead of current cursor position (the native side might
temporarily move the cursor to the end when word selection list opens
or closes) to replace the typed word with one selected from suggested
word list.

Stored cursor position is dismissed immediately after used, or
if cached preedit string is dismissed.

Task-number: QTBUG-22147
Reviewed-by: Miikka Heikkinen
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 19 Oct 2011 19:46:33 +0000 (05:46 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Workaround to VideoCore III scissor bug.

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Wed, 19 Oct 2011 16:03:14 +0000 (02:03 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4

6 years agoFixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4
aavit [Wed, 19 Oct 2011 12:02:24 +0000 (14:02 +0200)]
Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4

The PNG Development Group explains that libpng 1.5.4 (only) introduced
a divide-by-zero bug in png_handle_cHRM(), which could lead to crashes
(denial of service) for certain malformed PNGs.
Ref. http://www.libpng.org/pub/png/libpng.html

Task-number: QTBUG-22168

6 years agoWorkaround to VideoCore III scissor bug.
Jani Hautakangas [Wed, 19 Oct 2011 06:39:22 +0000 (09:39 +0300)]
Workaround to VideoCore III scissor bug.

Some versions of VideoCore III drivers seem
to pollute and use stencil buffer when using
glScissors. Workaround is to clear stencil buffer
before disabling scissoring.

Task-number: QT-5308
Reviewed-by: Samuel Rødal
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 19 Oct 2011 08:02:05 +0000 (18:02 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix to QGLWidget crash

6 years agoFix to QGLWidget crash
Jani Hautakangas [Tue, 18 Oct 2011 10:04:21 +0000 (13:04 +0300)]
Fix to QGLWidget crash

QGLWidget crashed due to regression
caused by fix to QTTH-1553. Crash only
occurred if application was locked to
landscape mode but started when device
was in portrait mode.

Task-number: QTTH-1597
Reviewed-by: Laszlo Agocs
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 18 Oct 2011 10:08:02 +0000 (20:08 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Update def files

6 years agoUpdate def files
Jani Hautakangas [Tue, 18 Oct 2011 09:52:30 +0000 (12:52 +0300)]
Update def files

Reviewed-by: TRUSTME
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Mon, 17 Oct 2011 07:29:02 +0000 (17:29 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Typo fix

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Mon, 17 Oct 2011 03:45:04 +0000 (13:45 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Fix crash on exit when overriding signal handlers in states.

7 years agoFix crash on exit when overriding signal handlers in states.
Michael Brasser [Fri, 30 Sep 2011 03:33:56 +0000 (13:33 +1000)]
Fix crash on exit when overriding signal handlers in states.

Change-Id: I0e73948f18aa1b78c7e92677167673b84a90a450
Task-number: QTBUG-21617
Reviewed-by: Martin Jones
7 years agoTypo fix
Jani Hautakangas [Fri, 14 Oct 2011 16:36:08 +0000 (19:36 +0300)]
Typo fix

Reviewed-by: trustme
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Fri, 14 Oct 2011 16:25:51 +0000 (02:25 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Add new signals to indicate GPU resource usage.
  symbian - search drives for translation files

7 years agoMerge remote branch 'qt/4.7' into 4.7
Shane Kearns [Fri, 14 Oct 2011 16:17:58 +0000 (17:17 +0100)]
Merge remote branch 'qt/4.7' into 4.7

Conflicts:
src/corelib/kernel/qtranslator.cpp

7 years agoAdd new signals to indicate GPU resource usage.
Jani Hautakangas [Fri, 14 Oct 2011 10:00:15 +0000 (13:00 +0300)]
Add new signals to indicate GPU resource usage.

QML elements that use GPU resources directly
needs to know when Qt releases GPU resources
and when they are available again.

Task-number: QT-5310
Reviewed-by: Samuel Rødal
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 13 Oct 2011 16:38:03 +0000 (02:38 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  symbian - search drives for translation files

7 years agosymbian - search drives for translation files
Shane Kearns [Thu, 13 Oct 2011 14:45:47 +0000 (15:45 +0100)]
symbian - search drives for translation files

Qt may be installed on a different drive from the application,
particularly the case when Qt is included in ROM (Z:) and the
application is on C:

With this change, if QTranslator::load() specifies an absolute
directory in the filesystem (e.g. "/resource/qt/translations") without
a drive letter, then the symbian search paths are used.
Note that this example path is the one returned by QLibraryInfo so
applications using the example code from
http://doc.qt.nokia.com/latest/internationalization.html#produce-translations
will work as expected.

Task-number: QT-5246
Reviewed-by: mread
7 years agosymbian - search drives for translation files
Shane Kearns [Thu, 13 Oct 2011 14:45:47 +0000 (15:45 +0100)]
symbian - search drives for translation files

Qt may be installed on a different drive from the application,
particularly the case when Qt is included in ROM (Z:) and the
application is on C:

With this change, if QTranslator::load() specifies an absolute
directory in the filesystem (e.g. "/resource/qt/translations") without
a drive letter, then the symbian search paths are used.
Note that this example path is the one returned by QLibraryInfo so
applications using the example code from
http://doc.qt.nokia.com/latest/internationalization.html#produce-translations
will work as expected.

Task-number: QT-5246
Reviewed-by: mread
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Wed, 12 Oct 2011 07:19:01 +0000 (17:19 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Cannot flick to the end of a horizontal list view width LayoutMirroring

7 years agoCannot flick to the end of a horizontal list view width LayoutMirroring
Martin Jones [Wed, 12 Oct 2011 07:02:12 +0000 (17:02 +1000)]
Cannot flick to the end of a horizontal list view width LayoutMirroring

minXExtent calculated the offset due to highlight range incorrectly
(reversed) when mirroring enabled.  Also us same algorithm for fixup()
in GridView and ListView uses.

Change-Id: Id7e7e540a894d6f520685b237d34b4186bc427b6
Task-number: QTBUG-21756
Reviewed-by: Bea Lam
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Wed, 12 Oct 2011 00:07:57 +0000 (10:07 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Backport more imports directory caching changes.
  Fix more test DEPLOYMENT statements for Symbian
  Fix deployment for declarative tests, examples on Symbian
  Fix StrictlyEnforceRange with snapOneItem/Row and header behavior, pt 2
  Backport imports directory caching performance optimization

7 years agoBackport more imports directory caching changes.
Martin Jones [Tue, 11 Oct 2011 23:35:42 +0000 (09:35 +1000)]
Backport more imports directory caching changes.

Fixes error reporting on Windows.

Change-Id: I49b559aa9d0c227be4e8e3d0fdc43c402273a302
Task-number: QTBUG-15899
Reviewed-by: Damian Jansen
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 11 Oct 2011 15:32:52 +0000 (01:32 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Symbian - fix deleteLater not working from RunL

7 years agoSymbian - fix deleteLater not working from RunL
Shane Kearns [Tue, 11 Oct 2011 14:51:58 +0000 (15:51 +0100)]
Symbian - fix deleteLater not working from RunL

deleteLater stores the loop level in the deferred delete event to
prevent the object being deleted by a nested event loop.
However as symbian active object RunL functions are called directly
from the active scheduler, the loop level is incorrect at that point.
(It is normally set by QCoreApplication::notifyInternal)

To solve this, the loop level is adjusted before calling RunIfReady
so that it is correct during RunL functions. It is then adjusted back
for the specific active objects in the event dispatcher that call
into QCoreApplication - sendPostedEvents, sendEvent.

Task-number: QTBUG-21928
Reviewed-by: mread
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
Qt Continuous Integration System [Mon, 10 Oct 2011 11:50:43 +0000 (21:50 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
  Doc updates to installation, platform notes and symbian introduction.

7 years agoDoc updates to installation, platform notes and symbian introduction.
Eero Hyyti [Mon, 10 Oct 2011 11:12:52 +0000 (14:12 +0300)]
Doc updates to installation, platform notes and symbian introduction.

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 6 Oct 2011 06:13:29 +0000 (16:13 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Do not let QGLContext get out of sync when doing mixed VG-GL rendering

7 years agoDo not let QGLContext get out of sync when doing mixed VG-GL rendering
Laszlo Agocs [Thu, 6 Oct 2011 05:26:48 +0000 (08:26 +0300)]
Do not let QGLContext get out of sync when doing mixed VG-GL rendering

The default graphics system is openvg, this means that apps using
QGLWidget (despite the official recommendation), without explicitly
setting opengl as the graphics system will use both the openvg and
opengl modules to perform rendering. This presents some problems
because QtOpenGL's comes with its own wrapper over QEglContext,
and making a foreign QEglContext (e.g. from VG) current will cause
its state to get out of sync, resulting in various drawing issues
due to skipped makeCurrent and similar calls.

The patch works this around by querying the current context from
EGL in QGLContext::currentContext() and returning null if the
EGLContext does not match. This somewhat ugly workaround ensures
that at least QGLContext::currentContext() will not lie: It will
not return a valid pointer when the underlying QEglContext's
underlying EGLContext is not actually the current context. This
will allow e.g. QGLPaintDevice::beginPaint to correctly recognize
the need for making the GL widget's context current and thus
avoid various rendering issues in certain games.

Task-number: QTTH-1553
Reviewed-by: Jani Hautakangas
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 5 Oct 2011 09:43:18 +0000 (19:43 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Create auto test for http HEAD request
  QNAM - fix poor performance of HEAD request with authentication

7 years agoFix more test DEPLOYMENT statements for Symbian
Damian Jansen [Wed, 5 Oct 2011 03:50:08 +0000 (13:50 +1000)]
Fix more test DEPLOYMENT statements for Symbian

Reviewed-by: Rohan McGovern
7 years agoCreate auto test for http HEAD request
Shane Kearns [Mon, 3 Oct 2011 15:29:43 +0000 (16:29 +0100)]
Create auto test for http HEAD request

This is in order to have a regression test for QT-5304.
However the test is also checking basic functionality of head
requests too.

Task-Number: QT-5304
Reviewed-By: Martin Petersson
7 years agoQNAM - fix poor performance of HEAD request with authentication
Shane Kearns [Mon, 3 Oct 2011 15:27:34 +0000 (16:27 +0100)]
QNAM - fix poor performance of HEAD request with authentication

QHttpNetworkReply was waiting for a body to be sent for 401 and 407
responses, whereas with a HTTP HEAD request, there will be no body.

This delayed the authentication signal until after the http channel
is closed by the server after a timeout. For example with the server
used for autotesting, the authentication signal is delayed 15 seconds.

When the server has a very long timeout, the authentication signal may
not be emitted at all.

Task-Number: QT-5304
Reviewed-By: Martin Petersson
7 years agoFix deployment for declarative tests, examples on Symbian
Damian Jansen [Tue, 4 Oct 2011 04:53:19 +0000 (14:53 +1000)]
Fix deployment for declarative tests, examples on Symbian

Task-number: QTBUG-21306
Reviewed-by: Rohan McGovern
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Mon, 3 Oct 2011 06:02:23 +0000 (16:02 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  symbian - add support for ELangKazakh and ELangEnglish_India

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 28 Sep 2011 14:25:35 +0000 (00:25 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  QAuthenticator::setUser() parse user name in form user@domain

7 years agosymbian - add support for ELangKazakh and ELangEnglish_India
Shane Kearns [Wed, 28 Sep 2011 14:12:44 +0000 (15:12 +0100)]
symbian - add support for ELangKazakh and ELangEnglish_India

I have not cherry picked this from 4.8 because it's tied up with a
feature implementation that refactored the code somewhat.

Task-number: QT-5298
Reviewed-by: mread
7 years agoQAuthenticator::setUser() parse user name in form user@domain
Martin Petersson [Mon, 20 Jun 2011 11:03:40 +0000 (13:03 +0200)]
QAuthenticator::setUser() parse user name in form user@domain

Task-number: QTBUG-19894
Change-Id: I063dbc66e5f47a83cc1c0aee8913062b4b5e42bc
(cherry picked from commit d3313bc2f095dc15718b2a1ed613489ab1ae0927)

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 28 Sep 2011 03:48:09 +0000 (13:48 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  A patch for 'Fix to QtOpenGL crash'
  Always recreate backing store when TLW transparency changes
  Crash in QDeclarativeCompiler::indexOfProperty
  Fix to QtOpenGL crash

7 years agoA patch for 'Fix to QtOpenGL crash'
Jani Hautakangas [Tue, 27 Sep 2011 20:55:42 +0000 (23:55 +0300)]
A patch for 'Fix to QtOpenGL crash'

EGL API was used also on non-EGL Symbian platforms
which generated compile errors when compiling Qt
on those platforms. This patch #ifdefs EGL usage
correctly for EGL enabled platforms only.

Reviewed-by: TRUSTME
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
Qt Continuous Integration System [Tue, 27 Sep 2011 18:19:32 +0000 (04:19 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
  Document updates to Qt for Symbian installation instructions and platform notes.

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Tue, 27 Sep 2011 14:28:41 +0000 (00:28 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Update Korean Translations

7 years agoUpdate Korean Translations
shkim [Tue, 27 Sep 2011 13:18:19 +0000 (15:18 +0200)]
Update Korean Translations

Merge-request: 1401
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
7 years agoDocument updates to Qt for Symbian installation instructions and platform notes.
Eero Hyyti [Tue, 27 Sep 2011 13:09:42 +0000 (16:09 +0300)]
Document updates to Qt for Symbian installation instructions and platform notes.

7 years agoAlways recreate backing store when TLW transparency changes
Gareth Stockwell [Wed, 31 Aug 2011 14:52:25 +0000 (15:52 +0100)]
Always recreate backing store when TLW transparency changes

When using either the opengl or openvg graphics system on Symbian,
if a TLW is made transparent, the widget switches to using raster
rendering, because EGL surface transparency is currently not
supported by the platform.

This patch enables the reverse to occur: when the widget is
subsequently made opaque, rendering switches back to using GL/VG.

Task-number: QTBUG-21211
Reviewed-by: Jani Hautakangas
Reviewed-by: Laszlo Agocs
Reviewed-by: Sami Merila
7 years agoCrash in QDeclarativeCompiler::indexOfProperty
Sami Merila [Tue, 27 Sep 2011 05:17:25 +0000 (08:17 +0300)]
Crash in QDeclarativeCompiler::indexOfProperty

In QDeclarativePropertyCache, plain integer bitfield overrideIndex is
initialized with -1 in class constructor. Unfortunately, ARM compiler
treats bitfields as unsigned, unless explicitly defined as signed [1].
Therefore, overrideIndex actually gets initial value of 2147483647,
which causes array operations done with the index to fail.

As a fix, define overrideIndex as signed int bitfield.

[1] http://www.keil.com/support/man/docs/armccref/armccref_Babjddhe.htm
Under bitfields/Note: "A plain bitfield, declared without either
signed or unsigned qualifiers, is treated as unsigned"

Task-number: QT-5285
Reviewed-by: Aaron Kennedy
7 years agoFix to QtOpenGL crash
Jani Hautakangas [Fri, 23 Sep 2011 04:47:24 +0000 (07:47 +0300)]
Fix to QtOpenGL crash

Exiting the native video recorder on Symbian and going
back to Qt app which runs on opengl graphics system
crashed on some devices because there was not enough GPU
memory and also because low GPU mem device environment
detection was flawed. This patch fixes 32MB GPU memory
detection and adds wait/retrial to EGL surface creation
if it fails.

Task-number: QTBUG-21499
Reviewed-by: Laszlo Agocs
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 22 Sep 2011 13:38:42 +0000 (23:38 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Incorrect 'break' in switch-case was replaced by 'return'

7 years agoIncorrect 'break' in switch-case was replaced by 'return'
Viktor Kolesnyk [Mon, 5 Sep 2011 12:08:23 +0000 (15:08 +0300)]
Incorrect 'break' in switch-case was replaced by 'return'

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 22 Sep 2011 09:36:15 +0000 (19:36 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  QLineControl: selectedTextChanged() signal is omitted in some cases

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Sami Merila [Thu, 22 Sep 2011 08:41:48 +0000 (11:41 +0300)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7

7 years agoQLineControl: selectedTextChanged() signal is omitted in some cases
Sami Merila [Thu, 22 Sep 2011 08:23:23 +0000 (11:23 +0300)]
QLineControl: selectedTextChanged() signal is omitted in some cases

QLineControl does not emit selectionChanged() signal when
selection is changed due to handling of input method query.

As a fix, the signal is emitted when internal values for selection
end and beginning are changed in processInputMethodEvent().

Additionally, added deselect() test case for both QDeclarativeTextEdit
and QDeclarativeTextInput to help out autotesting of text selections.

Note that there are some differences in the QLineControl and QTextControl
implementations. This causes the different signal counts even if the
test steps are similar.

Task-number: QTBUG-21429
Reviewed-by: Miikka Heikkinen