qt:ibingows-qt-ios-plaszma.git
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration 4.7
Qt Continuous Integration System [Fri, 10 Jun 2011 12:54:13 +0000 (22:54 +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:
  Fixing OpenGL module build error on Solaris

7 years agoFixing OpenGL module build error on Solaris
Martin Pejcoch [Thu, 9 Jun 2011 15:26:22 +0000 (17:26 +0200)]
Fixing OpenGL module build error on Solaris

Even though the code was correct, the CC 5.9 compiler was producing
an error.

Task-number: QTBUG-19641
Reviewed by: Kim Motoyoshi Kalland
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 [Fri, 10 Jun 2011 09:21:09 +0000 (19:21 +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 dialog position adjustment regression in Symbian
  SSL readbuffer 16->32 kB

7 years agoFix dialog position adjustment regression in Symbian
Miikka Heikkinen [Fri, 10 Jun 2011 08:32:26 +0000 (11:32 +0300)]
Fix dialog position adjustment regression in Symbian

Removal of StyleChange event sending to dialogs in to previous
optimization (QTBUG-17840) caused dialogs to no longer adjust their
position properly at orientation switch. Added sending of a dummy
resize event for dialogs in case of KEikDynamicLayoutVariantSwitch
to trigger the adjustment.

Task-number: QT-5101
Reviewed-by: Sami Merila
7 years agoSSL readbuffer 16->32 kB
Jaakko Koskenkorva [Fri, 10 Jun 2011 08:43:35 +0000 (11:43 +0300)]
SSL readbuffer 16->32 kB

Enlarge SSL readbuffer as per performance testing results.
Checked from Shane Kearns that larger buffer is OK.

Task-id: http://bugreports.qt.nokia.com/browse/QTBUG-18943
RC id: ou1cimx1#779022

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, 9 Jun 2011 18:28:11 +0000 (04:28 +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 missing freeTexture() from fix for QTBUG-19180

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, 9 Jun 2011 14:27:32 +0000 (00:27 +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:
  Limit the cookies count per domain to 50.

7 years agoLimit the cookies count per domain to 50.
Jocelyn Turcotte [Tue, 7 Jun 2011 18:14:13 +0000 (20:14 +0200)]
Limit the cookies count per domain to 50.

This makes it more difficult for a single server to fill the client's cookie
jar. All major browsers currently have a similar limit.

This patch also modifies the "find already existing cookie" loop to use indexes
instead of iterators to match the newly added loop.

Reviewed-by: Peter Hartmann
7 years agoAdd missing freeTexture() from fix for QTBUG-19180
Jani Hautakangas [Thu, 9 Jun 2011 13:52:49 +0000 (16:52 +0300)]
Add missing freeTexture() from fix for QTBUG-19180

Task-number: QTBUG-19180
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 [Thu, 9 Jun 2011 10:54:02 +0000 (20:54 +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:
  Last word inputted was duplicated after input method hints changed
  Simplify texture pooling logic in GL graphics system.

7 years agoLast word inputted was duplicated after input method hints changed
Sami Merila [Thu, 9 Jun 2011 10:45:16 +0000 (13:45 +0300)]
Last word inputted was duplicated after input method hints changed

If input hints change call reset() to avoid duplication of predicted
text into input widget. Otherwise input widget will commit the
predicted word AND whatever the user has so far typed.

Task-number: QTBUG-19689
Reviewed-by: Miikka Heikkinen
7 years agoSimplify texture pooling logic in GL graphics system.
Jani Hautakangas [Tue, 10 May 2011 20:41:09 +0000 (23:41 +0300)]
Simplify texture pooling logic in GL graphics system.

Remove ugly TemporarilyCachedBindOption and use QGLTexture
objects as texture pool entries instead of QGLPixmapData.
Make texture pooling totally Symbian specific, remove
VG like texture pooling code and use common texture binding
path which is used on other platforms also on Symbian.
QGLPixmapData should be only used to bind SgImage based
textures (will be implemented by another commit).

Task-number: QTBUG-19180
Reviewed-by: Samuel Rødal
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 8 Jun 2011 11:32:10 +0000 (21:32 +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 internal state before emitting configurationChanged() signals.

7 years agoUpdate internal state before emitting configurationChanged() signals.
Xizhi Zhu [Wed, 8 Jun 2011 08:44:41 +0000 (11:44 +0300)]
Update internal state before emitting configurationChanged() signals.

PMO Bug 257336.

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, 8 Jun 2011 07:54:52 +0000 (17:54 +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:
  Fixed qmlshadersplugin manual test shaders on SGX family GPU:s.
  Fixed qmlshadersplugin on windows VC2008 toolchain.

7 years agoFixed qmlshadersplugin manual test shaders on SGX family GPU:s.
Marko Niemelä [Wed, 8 Jun 2011 07:16:38 +0000 (10:16 +0300)]
Fixed qmlshadersplugin manual test shaders on SGX family GPU:s.

SGX GPU requires precision definitions for all variables. Additionally some unnecessary semicolons were removed.

Reviewed-by: Kim Gronholm
7 years agoFixed qmlshadersplugin on windows VC2008 toolchain.
Marko Niemelä [Wed, 8 Jun 2011 07:14:56 +0000 (10:14 +0300)]
Fixed qmlshadersplugin on windows VC2008 toolchain.

This fix is originally submitted by George Tavares. APIENTRY is a Win32 macro defined as stdcall__ *

Reviewed-by: Kim Gronholm
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, 7 Jun 2011 13:06:42 +0000 (23:06 +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:
  Reset input context in Symbian when another window is opened.

7 years agoReset input context in Symbian when another window is opened.
Miikka Heikkinen [Tue, 7 Jun 2011 12:32:58 +0000 (15:32 +0300)]
Reset input context in Symbian when another window is opened.

When symbol menu is opened, input context needs to be reset or
preedit string duplication may occur after symbol menu is closed.

Task-number: QTBUG-19528
Reviewed-by: Sami Merila
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, 7 Jun 2011 08:28:20 +0000 (18:28 +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:
  KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget()

7 years agoKERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget()
Sami Merila [Tue, 7 Jun 2011 08:08:59 +0000 (11:08 +0300)]
KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget()

There is no check if graphics view pointer is null in the SLOT
function translateInputWidget().

Task-number: QTBUG-19734
Reviewed-by: Miikka Heikkinen
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, 6 Jun 2011 14:33:04 +0000 (00:33 +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:
  Close context menus during orientation change.
  Have -small-screen enabled in certain examples on Symbian always.

7 years agoClose context menus during orientation change.
Laszlo Agocs [Mon, 6 Jun 2011 11:53:36 +0000 (13:53 +0200)]
Close context menus during orientation change.

Make non-native QMenus, i.e. context menus, work like in Avkon.

Reviewed-by: Miikka Heikkinen
Reviewed-by: Sami Merila
Task-number: QTBUG-19656

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Mon, 6 Jun 2011 10:33:02 +0000 (20:33 +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 Japanese translations.

7 years agoHave -small-screen enabled in certain examples on Symbian always.
Laszlo Agocs [Mon, 6 Jun 2011 10:21:37 +0000 (12:21 +0200)]
Have -small-screen enabled in certain examples on Symbian always.

7 years agoUpdate Japanese translations.
Takumi ASAKI [Mon, 6 Jun 2011 10:13:58 +0000 (12:13 +0200)]
Update Japanese translations.

* Fix some inconsistent translations.
* Translate some missing messages.
* Update Japanese phrasebook.

Merge-request: 1249
Reviewed-by: ossi
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Sat, 4 Jun 2011 05:43:41 +0000 (15: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:
  Fix for winscw QtGui.def

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Sat, 4 Jun 2011 01:58:14 +0000 (11:58 +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:
  Revert some of "Make QMLViewer startup animation stop after a while"
  Add private method for flushing the pixmap cache.

7 years agoRevert some of "Make QMLViewer startup animation stop after a while"
Alan Alpert [Fri, 3 Jun 2011 01:19:44 +0000 (11:19 +1000)]
Revert some of "Make QMLViewer startup animation stop after a while"

This reverts most of commit c6e6a35aeb8794d68a3ca0c4e27a3a1181c066b5.

Only the startup.qml changes were meant to go in. The other stuff is an
experimental feature that was not supposed to be merged in.

Reviewed-by: Michael Brasser
7 years agoFix for winscw QtGui.def
Jani Hautakangas [Thu, 2 Jun 2011 08:15:33 +0000 (11:15 +0300)]
Fix for winscw QtGui.def

Reviewed-by: TRUSTME
7 years agoAdd private method for flushing the pixmap cache.
Michael Brasser [Thu, 2 Jun 2011 01:07:21 +0000 (11:07 +1000)]
Add private method for flushing the pixmap cache.

Change-Id: I7330383b89a3a313dd845274d17d38c714db20ce
Reviewed-by: Martin Jones
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Wed, 1 Jun 2011 23:48:33 +0000 (09:48 +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:
  Avoid buffer overrun in QMacPixmapData resizing
  Fix glyph metrics with QStaticText/Freetype/raster and light/no hinting
  Missing glyphs transforming QStaticText on X11/raster with subpixel AA
  Fixed clipping errors for non-extended paint engines.

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, 1 Jun 2011 19:51:29 +0000 (05:51 +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 QTreeWidget autotest cases on Symbian/VGA

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Wed, 1 Jun 2011 15:38:43 +0000 (01:38 +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:
  QDeclarative: Fix QPerformanceTimer on Symbian

7 years agoQDeclarative: Fix QPerformanceTimer on Symbian
Kai Koehne [Tue, 31 May 2011 15:57:14 +0000 (17:57 +0200)]
QDeclarative: Fix QPerformanceTimer on Symbian

QPerformanceTimer::elapsed() always returned 0 on Symbian. This
is because Q_OS_UNIX define is also set for Symbian. Fixed by moving
Q_OS_SYMBIAN before Q_OS_SYMBIAN, and fixing the logic.

Reviewed-by: Alessandro Portale
Task-number: QTBUG-19669

7 years agoFix QTreeWidget autotest cases on Symbian/VGA
Sami Merila [Wed, 1 Jun 2011 13:15:13 +0000 (16:15 +0300)]
Fix QTreeWidget autotest cases on Symbian/VGA

Make two autotest cases pass on Symbian/VGA devices.

Task-number: QT-5057
Reviewed-by: Miikka Heikkinen
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, 1 Jun 2011 07:08:04 +0000 (17: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:
  Increase SSL readbuffer 1 -> 16 kB
  Fix pixel metrics for Symbian VGA devices
  Revert "Fix QNetworkConfigurationManager usage outside main thread first"
  Fix tst_QGraphicsItem::sorting() test case for Symbian

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Jaakko Koskenkorva [Wed, 1 Jun 2011 07:03:29 +0000 (10:03 +0300)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7

7 years agoIncrease SSL readbuffer 1 -> 16 kB
Jaakko Koskenkorva [Tue, 31 May 2011 14:34:39 +0000 (17:34 +0300)]
Increase SSL readbuffer 1 -> 16 kB

Reading incoming data in Symbian is slow when it is done from the native RSocket in 1kB blocks.
Typically other native apps use 16 kB or even 24 kB (browser).
This contributes (among other slow tasks such as writing to mass memory) to the TCP window filling up.
This case, even though it should be recoverable, has proven to be problematic in some scenarios including downloading from Ovi Store via 3G.
The fix just increases the amount of data read, which speeds things up and makes the problematic window fill-up less common.

Reviewed-by: Shane Kearns
Task-number: QTBUG-18943

7 years agoFix pixel metrics for Symbian VGA devices
Sami Merila [Tue, 31 May 2011 12:58:19 +0000 (15:58 +0300)]
Fix pixel metrics for Symbian VGA devices

Pixel metrics for focus frame (PM_FocusFrameVMargin and
PM_FocusFrameHMargin) had invalid values for VGA screens. Additionally
these same pixel metrics were adjusted for nHD.

Now, all but one QTreeView test cases pass for either screensize.

Task-number: QT-5056
Reviewed-by: Tomi Vihria
7 years agoRevert "Fix QNetworkConfigurationManager usage outside main thread first"
Shane Kearns [Tue, 31 May 2011 11:51:05 +0000 (12:51 +0100)]
Revert "Fix QNetworkConfigurationManager usage outside main thread first"

This reverts commit 5f241ec1426447380b1e938ac7888fb16cde94f8.

Reason for reverting: Some already published applications suffer
from the deadlock behaviour, causing regressions.

Conflicts:

tests/auto/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp

7 years agoAvoid buffer overrun in QMacPixmapData resizing
Jiang Jiang [Tue, 31 May 2011 10:15:55 +0000 (12:15 +0200)]
Avoid buffer overrun in QMacPixmapData resizing

Shouldn't use size bigger than the original (source) pixels buffer
or the new one (just allocated).

Task-number: QTBUG-18547
Reviewed-by: aavit
7 years agoFix glyph metrics with QStaticText/Freetype/raster and light/no hinting
Eskil Abrahamsen Blomfeldt [Tue, 31 May 2011 09:29:46 +0000 (11:29 +0200)]
Fix glyph metrics with QStaticText/Freetype/raster and light/no hinting

This is a back-port of part of cad70d64d0bbada. In the raster engine's
drawCachedGlyphs(), which is used by QStaticText, we would use the wrong
metrics to lay out the glyphs, because loadGlyphMetrics() would assume
full hinting. A visible effect of this was that the baseline of rotated
text became wavy.

Task-number: QTBUG-18185
Reviewed-by: Jiang Jiang
7 years agoFix tst_QGraphicsItem::sorting() test case for Symbian
Miikka Heikkinen [Tue, 31 May 2011 08:22:14 +0000 (11:22 +0300)]
Fix tst_QGraphicsItem::sorting() test case for Symbian

Some devices have bigger than expected minimum width for scrollbars,
which broke the sorting test case as some objects that were expected to
be painted were fully obscured by scrollbars and therefore skipped.

Task-number: QT-5048
Reviewed-by: Janne Koskinen
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, 30 May 2011 16:14:03 +0000 (02:14 +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 QHeaderView test case for VGA Symbian devices.
  Fix for BCM2727 chip detection on Symbian
  Fix QMenuBar autotest failures for Symbian

7 years agoFix QHeaderView test case for VGA Symbian devices.
Miikka Heikkinen [Mon, 30 May 2011 11:23:00 +0000 (14:23 +0300)]
Fix QHeaderView test case for VGA Symbian devices.

Minimum section size is bigger than expected in VGA devices, which was
not taken into accound in two test cases.

Task-number: QT-5049
Reviewed-by: Sami Merila
7 years agoFix for BCM2727 chip detection on Symbian
Jani Hautakangas [Mon, 30 May 2011 11:02:15 +0000 (14:02 +0300)]
Fix for BCM2727 chip detection on Symbian

QSymbianGraphcisSystemEx::hasBCM2727() uses
bool QApplicationPrivate::useTranslucentEGLSurfaces to decide if
Symbian is running on BCM2727 chip which is not entirely correct.

bool QApplicationPrivate::useTranslucentEGLSurfaces should be
assigned according to QSymbianGraphcisSystemEx::hasBCM2727()
and QSymbianGraphcisSystemEx::hasBCM2727() should be
also static function.

Task-number: QTBUG-19578
Reviewed-by: Laszlo Agocs
7 years agoFix QMenuBar autotest failures for Symbian
Sami Merila [Mon, 30 May 2011 10:22:06 +0000 (13:22 +0300)]
Fix QMenuBar autotest failures for Symbian

Effectively three fixes to reach same autotest results as on other
Symbian devices and to make the case not crash (itself, or Qt).

a) Fix null pointer usage in QWidget.
   This is mostly theoretic case, since it requires that previous focus
   widget has widget, yet it doesn't have internal winId. Still test case
   manages to make this happen, so lets prevent the null pointer use.

b) Skip activatedCount_noQt3() test case,
   since it would require shortcut support and leads to test crash.
   Qt for Symbian should have shortcut support as a result of task
   http://bugreports.qt.nokia.com/browse/QTBUG-5730

c) Ensure that menu has at least 360 width in tests that send keypresses
   to the menu. Otherwise, menuitems might get set into menu extension,
   which makes highlight tests fail (since item is not visible).

Task-number: QT-5053
Reviewed-by: Tomi Vihria
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, 30 May 2011 10:15:26 +0000 (20:15 +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:
  Fixed contains check casing in mmf.pro file

7 years agoMissing glyphs transforming QStaticText on X11/raster with subpixel AA
Eskil Abrahamsen Blomfeldt [Mon, 30 May 2011 09:39:18 +0000 (11:39 +0200)]
Missing glyphs transforming QStaticText on X11/raster with subpixel AA

Static text took an untested and broken code path for the combo of
subpixel AA, X11, raster engine and transformation. This would cause
missing glyphs. The reason was that QStaticText took an unused code path
which turned out not to work. The workaround is to use gray AA on
transformed text, like we already do for the GL engine. In Qt 4.8, the
static text code path has been rewritten to use the Freetype cache
instead of the image glyph cache, so the bug will be fixed more properly
there.

Reviewed-by: Samuel
7 years agoFixed clipping errors for non-extended paint engines.
Samuel Rødal [Mon, 30 May 2011 07:38:47 +0000 (09:38 +0200)]
Fixed clipping errors for non-extended paint engines.

Partially revert change a33ef62469fd71bec for the non-extended paint
engine path.

Task-number: QTBUG-19525
Reviewed-by: Andy Shaw
7 years agoFixed contains check casing in mmf.pro file
Tomi Vihria [Mon, 30 May 2011 09:50:29 +0000 (12:50 +0300)]
Fixed contains check casing in mmf.pro file

Contains check in mmf.pro was spelled in upper case, but qmake's
internal contains function isn't case-insensitive and needs to be
spelled in lower case.

Reviewed-by: Miikka Heikkinen
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Sat, 28 May 2011 00:05:57 +0000 (10:05 +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:
  QToolButton autotest trigger() fails in E6
  Documented Symbian peculiarity about QDesktopWidget::availableGeometry
  Fix non-Symbian builds broken by previous commit.
  Fix SYMBIAN_VERSION_* ifdeffing
  Predictive text is not committed when writing in a QLineEdit

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Fri, 27 May 2011 14:10:25 +0000 (00:10 +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:
  Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalAlignment and anchors.mirror properties

7 years agoQToolButton autotest trigger() fails in E6
Sami Merila [Fri, 27 May 2011 13:31:56 +0000 (16:31 +0300)]
QToolButton autotest trigger() fails in E6

In E6 device, QToolButton autotest trigger() fails due to mouse
click not hitting the context menu at all.

Task-number: QT-5055
Reviewed-by: Miikka Heikkinen
7 years agoDocumented Symbian peculiarity about QDesktopWidget::availableGeometry
Miikka Heikkinen [Fri, 27 May 2011 10:45:34 +0000 (13:45 +0300)]
Documented Symbian peculiarity about QDesktopWidget::availableGeometry

In Symbian QDesktopWidget::availableGeometry() is not guaranteed to
return correct values at the time the resize event related to the
geometry change is passed to the widgets. There is a similar issue
with QDesktopWidget::screenGeometry(). Documented this fact.

Task-number: QTBUG-14058
Reviewed-by: Sami Merila
7 years agoFix non-Symbian builds broken by previous commit.
Miikka Heikkinen [Fri, 27 May 2011 09:34:08 +0000 (12:34 +0300)]
Fix non-Symbian builds broken by previous commit.

Task-number: QT-5065
Reviewed-by: Sami Merila
7 years agoFix SYMBIAN_VERSION_* ifdeffing
Miikka Heikkinen [Fri, 27 May 2011 07:48:18 +0000 (10:48 +0300)]
Fix SYMBIAN_VERSION_* ifdeffing

QFileDialog and QSoftkeyManager broke in S60 5.3 platform because
incorrect version ifdeffing.

Task-number: QT-5065
Reviewed-by: Sami Merila
7 years agoRemove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalAlignment...
Joona Petrell [Thu, 14 Apr 2011 07:36:38 +0000 (10:36 +0300)]
Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalAlignment and anchors.mirror properties

* these properties are seldomly used
* they confuse developers that do not care about right-to-left user interfaces
* LayoutMirroring.enabled property can be used instead to determine if mirroring is enabled
* if needed, you can easily determine the effective layout directions and alignments
  with a little bit of JavaScript:

function effectiveLayoutDirection() {
    if (LayoutMirroring.enabled)
        return (listView.layoutDirection == Qt.LeftToRight) ? Qt.RightToLeft : Qt.LeftToRight;
    else
        return listView.layoutDirection;
}

Task-number: QTBUG-11042
Reviewed-by: Martin Jones
7 years agoPredictive text is not committed when writing in a QLineEdit
Sami Merila [Thu, 26 May 2011 13:26:04 +0000 (16:26 +0300)]
Predictive text is not committed when writing in a QLineEdit

QCoeFepInputContext is very aggressive committing its preedit string.
When AVKON FEP opens any of its subwindows, it steals the focus from
editable widget, which causes preedit string to get committed.
This makes the input context almost unusable with T9 word prediction.

As it is rather difficult to prevent focus loss in these types of use
scenarios, replace the committed string with user selected word when
suggested word list is closed.

Task-number: QTBUG-15031
Reviewed-by: Miikka Heikkinen
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, 26 May 2011 12:03:04 +0000 (22:03 +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:
  Fixed more CI-errors caused by qmlshadersplugin addition.
  Fixed CI-errors caused by qmlshadersplugin addition.
  Fixing Linux compatibility issues for Symbian
  Update the detection of is_using_gnupoc for S3.
  Backported QML ShaderEffectItem from QML2.0 into Qt Quick 1.1
  Revert "Fixing Linux compatibility issues for Symbian"
  sockets: limit buffer size of the internal sockets in proxy engines

7 years agoFixed more CI-errors caused by qmlshadersplugin addition.
Marko Niemelä [Thu, 26 May 2011 12:01:49 +0000 (15:01 +0300)]
Fixed more CI-errors caused by qmlshadersplugin addition.

These are additional fixes for CI-issues caused by db20b6c03b6a93ab3e483cd85d5d0a923c3d3430

Reviewed-by: Kim Gronholm
7 years agoFixed CI-errors caused by qmlshadersplugin addition.
Marko Niemelä [Thu, 26 May 2011 07:11:17 +0000 (10:11 +0300)]
Fixed CI-errors caused by qmlshadersplugin addition.

These are fixes for CI-issues caused by db20b6c03b6a93ab3e483cd85d5d0a923c3d3430

Reviewed-by: Kim Gronholm
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Wed, 25 May 2011 20:37:52 +0000 (06:37 +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 boundry conditions for cursor hit test
  Fix cursor position test on CursorOnCharacter case
  Fix xToCursor issue due to backporting from 4.8
  Support placing cursor in ligature with mouse or touch

7 years agoFixing Linux compatibility issues for Symbian
Tomi Vihria [Wed, 18 May 2011 14:43:14 +0000 (17:43 +0300)]
Fixing Linux compatibility issues for Symbian

The patch applies everything from the original, except for the
filename case changes in LIBS which are handled differently
based on the auto-detected is_using_gnupoc CONFIG value.

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 [Wed, 25 May 2011 16:48:56 +0000 (02:48 +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 the "Host" header for ipv6 URLs in QNAM

7 years agoFix boundry conditions for cursor hit test
Jiang Jiang [Wed, 25 May 2011 16:24:30 +0000 (18:24 +0200)]
Fix boundry conditions for cursor hit test

Clicking at the edge of a glyph means lookup for the left glyph.

Reviewed-by: TrustMe
(cherry picked from commit 31110bf84bb06d57983501fa65fe0db3f7c61927)

7 years agoUpdate the detection of is_using_gnupoc for S3.
Liang Qi [Wed, 25 May 2011 13:09:33 +0000 (15:09 +0200)]
Update the detection of is_using_gnupoc for S3.

The akndoc.h was moved to epoc32/include/mw.

Reviewed-By: axis
7 years agoBackported QML ShaderEffectItem from QML2.0 into Qt Quick 1.1
Marko Niemelä [Wed, 25 May 2011 11:19:14 +0000 (14:19 +0300)]
Backported QML ShaderEffectItem from QML2.0 into Qt Quick 1.1

This issue is about backporting Scenegraph's ShaderEffectItem and ShaderEffectSource elements into Qt Quick 1.1 as a Qt labs plugin.
Purpose of these elements is to provide an interface for utilizing OpenGL shaders in QML applications.

Task-number: QTBUG-18346
Reviewed-by: Kim Gronholm
7 years agoRevert "Fixing Linux compatibility issues for Symbian"
Laszlo Agocs [Wed, 25 May 2011 09:39:12 +0000 (11:39 +0200)]
Revert "Fixing Linux compatibility issues for Symbian"

Changing the library names to lowercase breaks 5.0-based
Linux builds. It will be investigated if it is possible to
change the SDKs instead. If not, the patch will have to be
extended to use the original names for 5.0 and the lowercased
ones otherwise.

This reverts commit 5933d4e4fb8b48ebed641e7f6b1d032df253df30.

7 years agoFix cursor position test on CursorOnCharacter case
Jiang Jiang [Wed, 25 May 2011 08:55:52 +0000 (10:55 +0200)]
Fix cursor position test on CursorOnCharacter case

Reviewed-by: TrustMe
7 years agofix the "Host" header for ipv6 URLs in QNAM
shiroki [Wed, 25 May 2011 09:26:23 +0000 (11:26 +0200)]
fix the "Host" header for ipv6 URLs in QNAM

Reviewed-by: Markus Goetz
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Wed, 25 May 2011 08:54:29 +0000 (18:54 +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:
  Flickable could flick in wrong direction if given too few touch samples

7 years agoFlickable could flick in wrong direction if given too few touch samples
Martin Jones [Wed, 25 May 2011 03:01:33 +0000 (13:01 +1000)]
Flickable could flick in wrong direction if given too few touch samples

If we got <= QML_FLICK_DISCARDSAMPLES the previous velocity was not
cleared, so the view would continue flicking with the previous
velocity, and therefore the previous direction.

Change-Id: I876610f4522f32c814449309b01ec3787c5f6cc6
Task-number: QT-4903
Reviewed-by: Andrew den Exter
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 25 May 2011 00:56:50 +0000 (10:56 +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 the state of default network configuration.

7 years agoMerge remote branch 'mainline/4.7' into 4.7
Jiang Jiang [Tue, 24 May 2011 13:53:20 +0000 (15:53 +0200)]
Merge remote branch 'mainline/4.7' into 4.7

7 years agosockets: limit buffer size of the internal sockets in proxy engines
Shane Kearns [Tue, 24 May 2011 13:05:48 +0000 (14:05 +0100)]
sockets: limit buffer size of the internal sockets in proxy engines

The application can normally control the amount of buffering of a
socket or QNetworkReply by using the setReadBufferSize API.
This allows the application to flow control the TCP connection, and
avoids out of memory errors when the data being downloaded is received
faster than the application can process it.

However when using a proxy, the proxy socket engine has an internal
socket which is used to communicate with the proxy server. It is not
visible to the user, and does not have awareness of the buffer size of
the external socket.

To solve this, we limit the internal sockets' buffer size to 64k bytes.
Under normal operation, the data is swiftly copied to the external
socket where the buffer can grow (or not) based on the application's
set value for read buffer size.

Task-number: QT-4966
Reviewed-by: Markus Goetz
7 years agoFix xToCursor issue due to backporting from 4.8
Jiang Jiang [Tue, 24 May 2011 12:18:23 +0000 (14:18 +0200)]
Fix xToCursor issue due to backporting from 4.8

Task-number: QTBUG-19260
Reviewed-by: TrustMe
7 years agoFix the state of default network configuration.
Xizhi Zhu [Tue, 24 May 2011 10:43:45 +0000 (13:43 +0300)]
Fix the state of default network configuration.

PMO Bug 257336 - Default configuration remains in QNetworkConfiguration::Active state even when device moves out of WLAN coverage
This fix sets the default network configuration (of type UserChoice) back to Discovered when the network session is disconnected.

Reviewed-by: Cristiano di Flora
7 years agoSupport placing cursor in ligature with mouse or touch
Jiang Jiang [Thu, 19 May 2011 08:29:49 +0000 (10:29 +0200)]
Support placing cursor in ligature with mouse or touch

We need to find out the closest element in the ligature to
the point we clicked (or tapped), currently we do this by
dividing the width of that ligature glyph evenly by the number
of characters it covered. We only support Common and Greek script
at this point, ligatures in other scripts are still handled as a
whole.

Task-number: QTBUG-19260
Reviewed-by: Eskil
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Sun, 22 May 2011 22:57:15 +0000 (08: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:
  Absenting function in winscw def files.

7 years agoAbsenting function in winscw def files.
Laszlo Agocs [Fri, 20 May 2011 11:55:06 +0000 (13:55 +0200)]
Absenting function in winscw def files.

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Fri, 20 May 2011 09:54:26 +0000 (19:54 +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 ligature offset in multi-line text
  Make selection work across ligatures

7 years agoFix ligature offset in multi-line text
Jiang Jiang [Thu, 19 May 2011 10:40:03 +0000 (12:40 +0200)]
Fix ligature offset in multi-line text

Reviewed-by: Eskil
7 years agoMake selection work across ligatures
Jiang Jiang [Tue, 10 Aug 2010 13:58:25 +0000 (15:58 +0200)]
Make selection work across ligatures

For widgets like QPlainTextEdit, selection across ligatures (typically
'fi', 'ffi', 'fl', etc.) end up highlighting the entire ligature
glyphs, this patch fixed that by dividing width inside the ligature so
that selection will not expand past the actual selected characters.
Since cursor position already considered this, we merely adopted the
algorithm and made it a separated helper function for all necessary
cases. Dividing width directly looks like a temporary workaround but
works well enough so far for cursor positions.

Task-number: QTBUG-11969
Reviewed-by: Eskil
(cherry picked from commit 99fd5825dfb4d50cff93165995701a65b7a8e4ed)

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Fri, 20 May 2011 06:26:05 +0000 (16:26 +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:
  Notify when the TextInput cursorRectangle property changes within pre-edit

7 years agoNotify when the TextInput cursorRectangle property changes within pre-edit
Andrew den Exter [Fri, 20 May 2011 04:22:39 +0000 (14:22 +1000)]
Notify when the TextInput cursorRectangle property changes within pre-edit

Anything that updates the horizontal scroll is also likely to change the
position of the cursor rectangle and the micro focus.  So group these
actions together and ensure they're done before emitting
cursorPositionChanged() so positionToRectangle() returns a valid value
from that handler.

Change-Id: I5fadc58efb148a8dabe88a94381c86cd64dba3bd
Task-number: QTBUG-19089
Reviewed-by: Martin Jones
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, 19 May 2011 16:57:07 +0000 (02:57 +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 brush transform in QtDirectFB backend, fixing QTBUG-18577

7 years agoFix brush transform in QtDirectFB backend, fixing QTBUG-18577
Denis Oliver Kropp [Thu, 19 May 2011 13:51:47 +0000 (15:51 +0200)]
Fix brush transform in QtDirectFB backend, fixing QTBUG-18577

Merge-request: 1224
Reviewed-by: Marcel Schuette <marcel.schuette@nokia.com>
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, 19 May 2011 13:18:07 +0000 (23:18 +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:
  directfb: Paint engine enhancements

7 years agodirectfb: Paint engine enhancements
Denis Oliver Kropp [Thu, 19 May 2011 13:02:03 +0000 (15:02 +0200)]
directfb: Paint engine enhancements

- Support negative scaling using DSBLIT_FLIP_HORIZONTAL/VERTICAL (DirectFB >= 1.4.3).
- Implement drawing points.
- Implement rectangular path filling.
- Discard drawing when alpha is zero with SrcOver.
- Also use DirectFB StretchBlit() if supported by hardware.
- Unify/simplify pen/brush/composition support handling.
- Enhance output when printing raster fallbacks.
- Other minor cleanups.

Merge-request: 991
Reviewed-by: Marcel Schuette <marcel.schuette@nokia.com>
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, 18 May 2011 18:31:23 +0000 (04:31 +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:
  Fixing Linux compatibility issues for Symbian

7 years agoFixing Linux compatibility issues for Symbian
Tomi Vihria [Wed, 18 May 2011 14:43:14 +0000 (17:43 +0300)]
Fixing Linux compatibility issues for Symbian

Reviewed-by: Laszlo Agocs
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Wed, 18 May 2011 14:25:36 +0000 (00:25 +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 broken drawing with large fonts using QStaticText and FreeType

7 years agoFix broken drawing with large fonts using QStaticText and FreeType
Eskil Abrahamsen Blomfeldt [Wed, 18 May 2011 10:16:33 +0000 (12:16 +0200)]
Fix broken drawing with large fonts using QStaticText and FreeType

In FreeType, there's a fall back to QFontEngine::alphaMapForGlyph()
when the fonts are very large. Since this uses a QPainterPath containing
an unhinted glyph, the use of hinted metrics would sometimes lead to
the glyphs being clipped because they would be positioned slightly
outside the image they were painted into. When outline drawing is on,
it makes sense to return unhinted metrics, since the glyphs we will
actually use are unhinted.

Task-number: QTBUG-19067
Reviewed-by: Jiang Jiang
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 18 May 2011 08:25:24 +0000 (18:25 +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:
  Re-apply licenseheader text in source files for qt4.7

7 years agoRe-apply licenseheader text in source files for qt4.7
Jyri Tahtela [Wed, 18 May 2011 08:04:43 +0000 (11:04 +0300)]
Re-apply licenseheader text in source files for qt4.7

New files after previous license change round.

Reviewed-by: Trust Me
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, 17 May 2011 00:40:07 +0000 (10:40 +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:
  Updating file with CRLF line endings for the updated header
  Fix a regression in QList::mid()
  update gitignore
  remove -fno-stack-protector
  Fix make confclean
  Update licenseheader text in source files

7 years agoUpdating file with CRLF line endings for the updated header
Sergio Ahumada [Tue, 17 May 2011 00:14:05 +0000 (02:14 +0200)]
Updating file with CRLF line endings for the updated header

This file requires CRLF line terminators to pass the tst_moc test
after a license update.

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Mon, 16 May 2011 08:51:11 +0000 (18:51 +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:
  Fixed bug in meego graphics system runtime switching.