qt:qt.git
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration v4.7.4
Qt Continuous Integration System [Tue, 23 Aug 2011 07:00:48 +0000 (17:00 +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 problem with grabWindow on Mac OS X 10.6 with Cocoa
  don't crash when destroying children
  Fix compile issue with Mac OS X 10.5
  Fix QPixmap::grabWindow() on Mac OS X Lion
  Update 4.7.4 changes

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Mon, 22 Aug 2011 23:43:40 +0000 (09: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:
  Symbian: Not possible to catch RequestSoftwareInputPanel in eventFilter
  Exact word bubble doesn't disappear when screen is tapped (fix part 2)
  Make text rendering working outside the gui thread on Symbian.

10 years agoSymbian: Not possible to catch RequestSoftwareInputPanel in eventFilter
Sami Merila [Mon, 22 Aug 2011 14:09:01 +0000 (17:09 +0300)]
Symbian: Not possible to catch RequestSoftwareInputPanel in eventFilter

Do not consume QEvent::RequestSoftwareInputPanel in QCoeFepInputContext.

Task-number: QTBUG-20155
Reviewed-by: Miikka Heikkinen
10 years agoFix problem with grabWindow on Mac OS X 10.6 with Cocoa
Andy Shaw [Mon, 22 Aug 2011 13:16:34 +0000 (15:16 +0200)]
Fix problem with grabWindow on Mac OS X 10.6 with Cocoa

For some reason the test did not fail locally but fails in the CI
system.  A manual check of the images from the test shows it should
have failed.  Reason for this will be investigated separately

Reviewed-by: Sergio Ahumada
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Mrudul Pendharkar [Mon, 22 Aug 2011 13:36:49 +0000 (16:36 +0300)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
Qt Continuous Integration System [Mon, 22 Aug 2011 12:30:23 +0000 (22:30 +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:
  Added an additional check to workaround an issue on Windows.

10 years agoAdded an additional check to workaround an issue on Windows.
David Boddie [Wed, 1 Jun 2011 12:11:09 +0000 (14:11 +0200)]
Added an additional check to workaround an issue on Windows.

Reviewed-by: David Boddie
Original-patch-by: Friedemann Kleint
(cherry picked from commit 8b1654ec6a892e84c1654c9196e80461ee6e92fa)

10 years agodon't crash when destroying children
Konstantin Ritt [Sat, 20 Aug 2011 21:59:35 +0000 (01:59 +0400)]
don't crash when destroying children

this was uncovered by my don't-detach patch.

Reviewed-by: ossi
10 years agoFix compile issue with Mac OS X 10.5
Andy Shaw [Fri, 19 Aug 2011 14:15:57 +0000 (16:15 +0200)]
Fix compile issue with Mac OS X 10.5

Reviewed-by: ossi
10 years agoExact word bubble doesn't disappear when screen is tapped (fix part 2)
Sami Merila [Fri, 19 Aug 2011 11:49:27 +0000 (14:49 +0300)]
Exact word bubble doesn't disappear when screen is tapped (fix part 2)

Prevent syncing with native side, if input capability changes are
pending. Native side seems to be rather touchy about extra events,
and might crash if syncing is requested while handling a capability
change is on-going.

Additionally, only cancel the transaction once. Otherwise cancellation
might lead into loop (since we sync the state with native side) that
eventually causes the application to crash.

Task-number: QTBUG-20919
Reviewed-by: Miikka Heikkinen
10 years agoFix QPixmap::grabWindow() on Mac OS X Lion
Andy Shaw [Fri, 19 Aug 2011 11:46:51 +0000 (13:46 +0200)]
Fix QPixmap::grabWindow() on Mac OS X Lion

The old approach was not the recommended one and although it worked on
Mac OS X 10.6 it did not work on 10.7.  The new approach works correctly
on 10.6 and 10.7, so the fix is applied for both versions.

Task-number: QTBUG-19824
Merge-request: 1332
Reviewed-by: sroedal
10 years agoUpdate 4.7.4 changes
Timo Turunen [Fri, 19 Aug 2011 10:19:01 +0000 (13:19 +0300)]
Update 4.7.4 changes

Reviewed-by: Trust Me
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
Qt Continuous Integration System [Thu, 18 Aug 2011 17:47:05 +0000 (03:47 +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: Clarified the range of return values from QLineF::angle().
  Doc: Fixed \since declarations.
  Doc: Standardized on QtQuick for \since declarations.
  Doc: Removed whitespace.
  Modified \since command behavior slightly to handle project and version.
  Doc: Added a simple introduction to Qt and fixed links.
  Doc: Added more appropriate links to help reduce confusion.
  Doc: Removed non-ASCII characters from the documentation.
  qdoc: Fixed QTBUG-19338

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 18 Aug 2011 14:20:46 +0000 (00:20 +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:
  Exact word bubble doesn't disappear when screen is tapped

10 years agoExact word bubble doesn't disappear when screen is tapped
Sami Merila [Thu, 18 Aug 2011 12:43:55 +0000 (15:43 +0300)]
Exact word bubble doesn't disappear when screen is tapped

Sync FEP-aware text editors state to native side. Thus, native side can
then do various operations based on editor state - such as removing
the user typed 'exact word bubble'.

Task-number: QTBUG-20919
Reviewed-by: Miikka Heikkinen
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 18 Aug 2011 10:44:17 +0000 (20:44 +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 non-ascii name issues in ICD.

10 years agoFix non-ascii name issues in ICD.
Xizhi Zhu [Thu, 18 Aug 2011 10:34:00 +0000 (13:34 +0300)]
Fix non-ascii name issues in ICD.

PMO Bug 275663.
Developed by Aapo Makela, reviewed by me.

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 18 Aug 2011 06:58:14 +0000 (16:58 +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:
  Compile fix for Symbian 5th and earlier

10 years agoCompile fix for Symbian 5th and earlier
Sami Merila [Thu, 18 Aug 2011 06:24:13 +0000 (09:24 +0300)]
Compile fix for Symbian 5th and earlier

Additional fix to enable compilation of Qt GUI
to succeed on earlier Symbian SDKs.

Task-number: QTBUG-20033
Reviewed-by: Kalle Lehtonen
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 17 Aug 2011 17:07:51 +0000 (03:07 +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 copying webkit guide under windows

10 years agofix copying webkit guide under windows
Oswald Buddenhagen [Wed, 17 Aug 2011 15:04:31 +0000 (17:04 +0200)]
fix copying webkit guide under windows

patch by Rob Tomek.

Task-number: QTBUG-19155

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 17 Aug 2011 13:26:53 +0000 (23:26 +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 backspace on empty lines of multiline textedits

10 years agoSymbian: Fix backspace on empty lines of multiline textedits
Miikka Heikkinen [Wed, 17 Aug 2011 09:57:14 +0000 (12:57 +0300)]
Symbian: Fix backspace on empty lines of multiline textedits

Backspace on empty lines of multiline textedits didn't work because
in Symbian the virtual keyboard only gets one block of text at a time,
and there is some internal optimization in FEP that if the document
is empty, backspace doesn't get generated. Fixed by faking document
lenght to be one in cases where it is actually zero, except for password
fields with hidden text, as an extra asterisk would be generated in
those cases. Typically password fields are not multiline so this
shouldn't be a problem.

Task-number: QTBUG-20444
Reviewed-by: Sami Merila
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 17 Aug 2011 09:26:21 +0000 (19:26 +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:
  Handle CloseSoftwareInputPanel event in QCoeFepInputContext

10 years agoHandle CloseSoftwareInputPanel event in QCoeFepInputContext
Sami Merila [Wed, 17 Aug 2011 08:46:16 +0000 (11:46 +0300)]
Handle CloseSoftwareInputPanel event in QCoeFepInputContext

Handle CloseSoftwareInputPanel event in QCoeFepInputContext (i.e.
notify the native side that SIP needs to be closed).
Note that event is not consumed.

Task-number: QTBUG-20033
Reviewed-by: Miikka Heikkinen
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Wed, 17 Aug 2011 03:27:49 +0000 (13:27 +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 delayed password masking mid-string.

10 years agoFix delayed password masking mid-string.
Andrew den Exter [Wed, 17 Aug 2011 02:52:09 +0000 (12:52 +1000)]
Fix delayed password masking mid-string.

Unmask the last character typed, not the last character in the string.

Change-Id: I9c70d2347bf878c18ab0a7f4ea76f755ca19a85c
Task-number: QTBUG-17003
Reviewed-by: Alan Alpert
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Tue, 16 Aug 2011 15:30:16 +0000 (01:30 +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:
  don't crash when destroying codec list

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 16 Aug 2011 11:29:20 +0000 (21: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:
  Disabled splitscreen translation still moves screen

10 years agoDisabled splitscreen translation still moves screen
Sami Merila [Tue, 16 Aug 2011 11:02:42 +0000 (14:02 +0300)]
Disabled splitscreen translation still moves screen

Do not connect (or disconnect) signal cursorPositionChanged() to slot
translateInputWidget() if auto-translation of splitview is disabled.

Task-number: QTBUG-20813
Reviewed-by: Miikka Heikkinen
10 years agoMake text rendering working outside the gui thread on Symbian.
Laszlo Agocs [Tue, 26 Apr 2011 13:35:51 +0000 (15:35 +0200)]
Make text rendering working outside the gui thread on Symbian.

It was previously not possible to render text (QPainter::drawText)
in a secondary thread on Symbian, it always resulted in some
kind of panic. This patch corrects it. For S60 5.0 and earlier
the behavior is not changed, threaded text rendering is only
supported on Symbian^3 and newer. This also means
QFontDatabase::supportsThreadedFontRendering() will return
true from now on, but only on Symbian^3 and higher.

Task-number: QTBUG-18516
Reviewed-by: mread
(cherry picked from commit 0c62e02b80570bf8b92eff7acceb9018df61c89e)

10 years agodon't crash when destroying codec list
Oswald Buddenhagen [Mon, 15 Aug 2011 16:10:02 +0000 (18:10 +0200)]
don't crash when destroying codec list

this was uncovered by rittk's don't-detach patch.

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Mon, 15 Aug 2011 12:07:32 +0000 (22:07 +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:
  Join user state of removed text blocks

10 years agoJoin user state of removed text blocks
Leandro Melo [Fri, 12 Aug 2011 16:45:42 +0000 (18:45 +0200)]
Join user state of removed text blocks

Done-with: mae

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Fri, 12 Aug 2011 21:46:37 +0000 (07:46 +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:
  Adding Persian translation of Qt.

10 years agoAdding Persian translation of Qt.
Soroush Rabiei [Fri, 12 Aug 2011 17:45:07 +0000 (19:45 +0200)]
Adding Persian translation of Qt.

Merge-request: 2640
Reviewed-by: ossi
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Fri, 12 Aug 2011 17:38:17 +0000 (03: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:
  Missed break of switch-case added

10 years agoMissed break of switch-case added
Viktor Kolesnyk [Fri, 12 Aug 2011 16:32:41 +0000 (18:32 +0200)]
Missed break of switch-case added

Merge-request: 2642
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Fri, 12 Aug 2011 13:50:16 +0000 (23:50 +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 softkeys cleanup
  Fix clientRect usage in QWidgetPrivate::setGeometry_sys()
  Do not allow fullscreen/maximized windows to expand beyond client rect
  Do not modify window size for fullscreen windows in setGeometry_sys

10 years agoFix softkeys cleanup
Miikka Heikkinen [Fri, 12 Aug 2011 12:29:20 +0000 (15:29 +0300)]
Fix softkeys cleanup

QSoftKeyManager's keyedActions and softKeyCommandActions hashes were
not properly cleaned up, resulting in randomly incorrect softkeys
as already deleted cached actions were assigned to softkeys if the
new action happened to be in the same address as the previously deleted
action.

Two bugs related to this were fixed:

1) qobject_cast can't be used in "destroyed" signal handler, as the
   cast will return NULL pointer in this case. Changed the cast to
   static_cast, which is safe here as the pointer is only used as a
   hash key.

2) If softkey action was created with QSoftKeyManager::createAction
   instead of QSoftKeyManager::createKeyedAction, the "destroyed"
   signal was not connected to cleanupHash slot, leaving such
   actions in softKeyCommandActions hash after deletion. Ensured
   the signal was connected properly in both cases.

Task-number: QTTH-1442, QTBUG-20214
Reviewed-by: Gareth Stockwell
10 years agoFix clientRect usage in QWidgetPrivate::setGeometry_sys()
Miikka Heikkinen [Thu, 11 Aug 2011 08:49:38 +0000 (11:49 +0300)]
Fix clientRect usage in QWidgetPrivate::setGeometry_sys()

S60->clientRect() should be used these days for getting S60 client rect,
so fix the old fashined usage that was in cherry-picked commit.

Task-number: QTTH-1306
Reviewed-by: TrustMe
10 years agoDo not allow fullscreen/maximized windows to expand beyond client rect
Miikka Heikkinen [Tue, 3 May 2011 13:50:46 +0000 (16:50 +0300)]
Do not allow fullscreen/maximized windows to expand beyond client rect

Automatic layouting of widgets still managed to layout maximized and
fullscreen windows larger than client rect in Symbian in some cases.
Fixed by limiting window dimensions to client area boundaries in
setGeometry_sys if the window is maximized or fullscreen.

Task-number: QTBUG-5697
Reviewed-by: Sami Merila
10 years agoDo not modify window size for fullscreen windows in setGeometry_sys
Miikka Heikkinen [Mon, 18 Apr 2011 12:40:26 +0000 (15:40 +0300)]
Do not modify window size for fullscreen windows in setGeometry_sys

Minimum sizes of widgets can cause windows to expand beyond screen
limits in QWidgetPrivate::setGeometry_sys. Normally this is not
noticeable as the window size is forced in various places to the
clientRect, but there are certain sequences where the size set in
setGeometry_sys is the final one, resulting in too large windows.

Removed the modification of window size in setGeometry_sys
for fullscreen windows for which the correct size is already requested.

Task-number: QTBUG-18749
Reviewed-by: Sami Merila
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 11 Aug 2011 04:30:19 +0000 (14:30 +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 accidental commit
  Rework threading internals in XmlListModel to avoid global static

10 years agoRevert accidental commit
Bea Lam [Thu, 11 Aug 2011 04:22:52 +0000 (14:22 +1000)]
Revert accidental commit

Revert "Rework threading internals in XmlListModel to avoid global static"

This reverts commit 7a80c5d656e5492dc026cbf643847d7f9c50324a.

10 years agoRework threading internals in XmlListModel to avoid global static
Bea Lam [Fri, 29 Jul 2011 06:16:57 +0000 (16:16 +1000)]
Rework threading internals in XmlListModel to avoid global static

QTBUG-20629 reports a crash on destruction of XmlListModel when
cleaning up the global static for the QDeclarativeXmlQuery object.

The fix restructures the internals to be like the threading structure
used for QDeclarativePixmapReader which doesn't use a global static.

Task-number: QTBUG-20629
Change-Id: I036cc673fa603ad4b5661f3facc811cc83710a89

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Mon, 8 Aug 2011 10:13:40 +0000 (20: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:
  Fix undesirable VKB popup at task switch

10 years agoFix undesirable VKB popup at task switch
Miikka Heikkinen [Mon, 8 Aug 2011 09:21:30 +0000 (12:21 +0300)]
Fix undesirable VKB popup at task switch

showInputPanelOnFocus = false needs to be set in declarative edit
controls also on S60 platforms beyond Symbian^3, or VKB will popup
when application itself comes to foreground if focus is on an edit
control.

With this fix the functionality is identical to S60 native apps.

Task-number: QTBUG-20218
Reviewed-by: Joona Petrell
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Fri, 5 Aug 2011 13:23:02 +0000 (23:23 +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 compile errors on S60 3.2
  Fix to QGLWidget rendering with VG graphics system

10 years agoFix compile errors on S60 3.2
Shane Kearns [Thu, 4 Aug 2011 16:16:05 +0000 (17:16 +0100)]
Fix compile errors on S60 3.2

Task-number: QTBUG-20743
Reviewed-by: Liang Qi
10 years agoFix to QGLWidget rendering with VG graphics system
Jani Hautakangas [Fri, 5 Aug 2011 12:34:01 +0000 (15:34 +0300)]
Fix to QGLWidget rendering with VG graphics system

QEGLContext don't expect EGL based API to change
on runtime (e.g. VG->GL). QEGLContext caches current API
context pointer and uses this cached value to determine whether
to make eglMakeCurrent call or not. VG graphics system and
QGLWidget creates own separate QEGLContext objects, but both
of those objects consider themself to be current context, so
no eglMakeCurrent call occurs even though the API has changed.
This patch adds ifdef'd current context check for Symbian
which enables eglMakeCurrent call if EGL API has changed.
(Symbian is the only supported platform currently where this scenario happens).

Task-number: QT-5012
Reviewed-by: Samuel Rødal
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 4 Aug 2011 17:37:59 +0000 (03:37 +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/gcce: Remove the useless -T flag

10 years agoSymbian/gcce: Remove the useless -T flag
Martin Storsjo [Thu, 4 Aug 2011 15:52:14 +0000 (17:52 +0200)]
Symbian/gcce: Remove the useless -T flag

The -T flag is a linker flag, not a compiler flag, and does
nothing. If specified as a linker flag, this even yields errors
(since there is no linker script file named 'script').

Merge-request: 1302
Reviewed-by: Liang Qi <liang.qi@nokia.com>
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 4 Aug 2011 13:34:09 +0000 (23: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:
  Fix installation on S60 5.0
  Fix fancybrowser.pro

10 years agoFix installation on S60 5.0
Shane Kearns [Thu, 4 Aug 2011 13:11:32 +0000 (14:11 +0100)]
Fix installation on S60 5.0

A case change broke the case sensitive comparison of UIDs to check if the
package being built was Qt itself - this caused a recursive dependency
in the sis file.

Task-number: QTBUG-20742
Reviewed-by: Miikka Heikkinen
10 years agoFix fancybrowser.pro
Shane Kearns [Thu, 4 Aug 2011 11:13:56 +0000 (12:13 +0100)]
Fix fancybrowser.pro

Somehow, the latin-1 multiply symbol was used instead of an 'x' in
hex literals.

Task-number: QTBUG-15716
Reviewed-by: mread
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 4 Aug 2011 01:33:05 +0000 (11:33 +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:
  Move cursorDelegate with the mouse selection of read only text input.

10 years agoMove cursorDelegate with the mouse selection of read only text input.
Andrew den Exter [Thu, 4 Aug 2011 00:58:26 +0000 (10:58 +1000)]
Move cursorDelegate with the mouse selection of read only text input.

Change-Id: Iae4b2f9f6c9a7da7ec0e194b2568fb3a6da8ea71
Task-number: QTBUG-19109
Reviewed-by: Martin Jones
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Wed, 3 Aug 2011 16:31:43 +0000 (02:31 +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:
  Updating libpng: Patches to libpng 1.5.4 for building it in Qt
  Updating libpng: Add libpng version 1.5.4
  Updating libpng: Remove version 1.4.0

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 3 Aug 2011 13:01:01 +0000 (23:01 +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:
  Ignore child elements in non-application caption/pkg name translations

10 years agoIgnore child elements in non-application caption/pkg name translations
Miikka Heikkinen [Wed, 3 Aug 2011 12:01:05 +0000 (15:01 +0300)]
Ignore child elements in non-application caption/pkg name translations

In Symbian, when parsing .ts files for deployment localization, qmake
would break if there was any translation using lengthvariants inside
QtApplicationCaptions context. Technically this is legal though
QtApplicationCaptions context is only meant for application captions
and we don't support lenghtvariants for the actual captions themselves.
Changed parsing so that any child elements on translations are simply
skipped instead of causing parsing errors.

Task-number: QT-5169
Reviewed-by: Guoqing Zhang
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Tue, 2 Aug 2011 20:07:09 +0000 (06:07 +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:
  Remove DerivedSources.pro from WebKit.

10 years agoRemove DerivedSources.pro from WebKit.
Jocelyn Turcotte [Tue, 2 Aug 2011 16:42:20 +0000 (18:42 +0200)]
Remove DerivedSources.pro from WebKit.

This .pro file gets processed by qmake while looking recursively for pro files.
This may cause warnings and the file isn't necessary since derived sources have
to be pre-generated before importing WebKit into src/3rdparty.

Reviewed-by: Benjamin Poulain
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 2 Aug 2011 16:25:58 +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:
  Support debuggable in the makefile build system
  Mark all Symbian debug binaries debuggable by default

10 years agoSupport debuggable in the makefile build system
Liang Qi [Tue, 2 Aug 2011 14:37:51 +0000 (16:37 +0200)]
Support debuggable in the makefile build system

Task-number: QTBUG-20697
Reviewed-by: Shane Kearns
Reviewed-by: Miikka Heikkinen
10 years agoMark all Symbian debug binaries debuggable by default
Miikka Heikkinen [Tue, 2 Aug 2011 11:44:12 +0000 (14:44 +0300)]
Mark all Symbian debug binaries debuggable by default

CODA 4.1.* cannot be used to debug binaries that do not have
DEBUGGABLE_UDEBONLY keyword specified, so add this keyword to all
projects by default. Adding this keyword has no impact for previous
versions of CODA or TRK.

Task-number: QTBUG-20669
Reviewed-by: Shane Kearns
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 2 Aug 2011 12:17:34 +0000 (22:17 +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:
  Detect linked fonts by name (insead of via CLinkedTypeface* Api)

10 years agoDetect linked fonts by name (insead of via CLinkedTypeface* Api)
Alessandro Portale [Tue, 2 Aug 2011 11:38:04 +0000 (13:38 +0200)]
Detect linked fonts by name (insead of via CLinkedTypeface* Api)

The detection of Linked Fonts via CLinkedTypeface* Api does not
work in all cases. It works in QML apps, but not in QWidgets based
apps. The reason is still unclear.

This commit replaces the CLinkedTypeface* Api based code of commit
fa344b355d311fce7954e2fd1a22a87a88194783 whith a simple type face
anme analysis. Assumption is that the names of Linked Fonts always
end with "LF" and are all upper case.

This patch has been tested by more people than just me, but it is
too dirty to mention the others as reviewer. I take the shame and
blame.

Task-Number: QTBUG-20007

10 years agoUpdating libpng: Patches to libpng 1.5.4 for building it in Qt
aavit [Fri, 25 Mar 2011 12:24:04 +0000 (13:24 +0100)]
Updating libpng: Patches to libpng 1.5.4 for building it in Qt

10 years agoUpdating libpng: Add libpng version 1.5.4
aavit [Tue, 2 Aug 2011 10:04:34 +0000 (12:04 +0200)]
Updating libpng: Add libpng version 1.5.4

This is a clean copy of the official libpng 1.5.4 distribution, except
that various extraneous stuff (examples, tests, etc) have been
removed, as usual. The minor modifications to build it in Qt will
follow in a separate commit.

10 years agoUpdating libpng: Remove version 1.4.0
aavit [Tue, 2 Aug 2011 09:46:52 +0000 (11:46 +0200)]
Updating libpng: Remove version 1.4.0

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
Qt Continuous Integration System [Tue, 2 Aug 2011 08:37:17 +0000 (18:37 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Thu, 28 Jul 2011 13:31:14 +0000 (23:31 +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:
  Revert binary search in QTextEngine::findItem

10 years agoRevert binary search in QTextEngine::findItem
Jiang Jiang [Thu, 28 Jul 2011 12:15:28 +0000 (14:15 +0200)]
Revert binary search in QTextEngine::findItem

It's part of c9607f069f0fb98021daf0af9f1d1b2981018e0c which caused
crash in certain cases.

Task-number: QTBUG-17209
Reviewed-by: Gunnar Sletta
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 27 Jul 2011 16:08:55 +0000 (02: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:
  Remove a duplicate include line

10 years agoRemove a duplicate include line
Liang Qi [Wed, 27 Jul 2011 13:59:02 +0000 (15:59 +0200)]
Remove a duplicate include line

Build Qt 4.7 for Symbian on Mac/gcce again.

Reviewed-by: Honglei Zhang
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Wed, 27 Jul 2011 12:12:04 +0000 (22:12 +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:
  Save previous font engine for right bearing adjustment
  Fix compilation under OSX 10.7 or using llvm-gcc.
  Fix typo in QFontDialog docs
  Reset previousGlyph once we reached a new text item

10 years agoSave previous font engine for right bearing adjustment
Jiang Jiang [Wed, 27 Jul 2011 08:42:40 +0000 (10:42 +0200)]
Save previous font engine for right bearing adjustment

In last fix I forgot that fd818312 was for saving and restoring the
right bearing (of last visible glyph) when a LineSeparator was hit
(which can have a different font engine but usually not visble),
thus we can't reset previousGlyph in that case. To make sure we
still get correct right bearing from the font engine used to shape
previousGlyph, we need to save that font engine as well. It does
make the code more complicated than simply saving the right bearing
when a QScriptItem boundary is hit, so hopefully it's an optimization
worth to be made (following e1915815).

Task-number: QTBUG-20423
Reviewed-by: Eskil
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 27 Jul 2011 08:19:46 +0000 (18:19 +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^3 workaround: Avoid usage of linked fonts.

10 years agoSymbian^3 workaround: Avoid usage of linked fonts.
Alessandro Portale [Mon, 25 Jul 2011 14:22:22 +0000 (16:22 +0200)]
Symbian^3 workaround: Avoid usage of linked fonts.

"Linked Fonts" are a new feature in Symbian^3, first used in SR11.1.
This patch prevents Qt from using linked fonts in any way.

Avkon based applications benefit from Linked Fonts because they can now
transparently render multi-script text, e.g. Latin/Chinese/Japanese (Qt
does that by its own and calls the feature 'font merging'). From Qt's
poing of view, Linked Fonts are a severe regression in Symbian's API.
1 Font table Api for linked fonts is extremely slow
2 'cmap' tables do not seem to reflect the "linkage", causing garbled
  text or crashes.
3 Linked fonts appear with cryptic type face names, and are redundant
  since they are just compounds of the other, real fonts.

This patch adds a detection of Linked Fonts using
CLinkedTypefaceSpecification and prevents their inclusion into
QFontDataBase. Furthermore, it detects if the Symbian System font is a
Linked font and if needed tries to fall back to a classical Symbian
system font, e.g. "Nokia Sans S60" or "Series 60 Sans". Fallback to
"Pure" will need to be added, later on.

Task-Number: QTBUG-20007
Co-authored-by: Miklos Vlasa
Reviewed-by: mread <qt-info@nokia.com>
10 years agoFix compilation under OSX 10.7 or using llvm-gcc.
Mike McQuaid [Tue, 26 Jul 2011 11:43:48 +0000 (13:43 +0200)]
Fix compilation under OSX 10.7 or using llvm-gcc.

Use correct error codes instead of type errors.
Thanks to Dylan Luke <lukes.dylan@gmail.com> for this patch.

Merge-request: 1304
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
10 years agoFix typo in QFontDialog docs
Jiang Jiang [Mon, 25 Jul 2011 14:16:50 +0000 (16:16 +0200)]
Fix typo in QFontDialog docs

Reviewed-by: TrustMe
10 years agoReset previousGlyph once we reached a new text item
Jiang Jiang [Mon, 25 Jul 2011 13:23:54 +0000 (15:23 +0200)]
Reset previousGlyph once we reached a new text item

The bug was introduced in fd818312. Before that, previousGlyph
is only saved in the same text item. After we moved it to
LineBreakHelper struct, it will cause crash if the font engine
in the new text item no longer contains the sub engine required
by previousGlyph.

Task-number: QTBUG-20243
Reviewed-by: Eskil
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Thu, 21 Jul 2011 11:39:49 +0000 (21:39 +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 crash when loading 16 bits-per-pixel grayscale TIFs.

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 21 Jul 2011 07:46:33 +0000 (17: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:
  Fix compilation on Symbian platforms without SgImage support

10 years agoFix compilation on Symbian platforms without SgImage support
Jani Hautakangas [Thu, 21 Jul 2011 07:10:25 +0000 (10:10 +0300)]
Fix compilation on Symbian platforms without SgImage support

Reviewed-by: Laszlo Agocs
10 years agoFixed crash when loading 16 bits-per-pixel grayscale TIFs.
Kim Motoyoshi Kalland [Tue, 19 Jul 2011 15:53:25 +0000 (17:53 +0200)]
Fixed crash when loading 16 bits-per-pixel grayscale TIFs.

Use the fallback path when encountering 16 bits-per-pixel
grayscale TIFs. Also fixed potential memory leak.

Task-number: QTBUG-19878
Reviewed-by: Samuel
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Tue, 19 Jul 2011 12:36:35 +0000 (22:36 +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:
  Check for buffer overflow in Lookup_MarkMarkPos

10 years agoCheck for buffer overflow in Lookup_MarkMarkPos
Jiang Jiang [Mon, 18 Jul 2011 06:49:32 +0000 (08:49 +0200)]
Check for buffer overflow in Lookup_MarkMarkPos

That may cause crash in this function with certain fonts.

Task-number: QTBUG-17238
Done-by: Alberto Garcia <agarcia@igalia.com>
Reviewed-by: Jiang Jiang
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Tue, 19 Jul 2011 08:31:38 +0000 (18:31 +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:
  Delay masking the last character in Password echo mode.

10 years agoDelay masking the last character in Password echo mode.
Andrew den Exter [Tue, 19 Jul 2011 05:15:58 +0000 (15:15 +1000)]
Delay masking the last character in Password echo mode.

If QT_GUI_PASSWORD_ECHO_DELAY is defined in qplatformdefs.h with an
integer value in milliseconds, QLineEdit and TextInput will display
the last character entered unmasked for that delay period and then
mask the character as normal.  If QT_GUI_PASSWORD_ECHO_DELAY is
not defined then the behaviour is unchanged.

Change-Id: I55f527932d34453828caba88e93ad57e012e79be
Task-number: QTBUG-17003
Reviewed-by: Martin Jones
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integr...
Qt Continuous Integration System [Tue, 19 Jul 2011 04:13:36 +0000 (14:13 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Updated license headers.
  Add system tests from research:systemtests repository.

10 years agoUpdated license headers.
Toby Tomkins [Tue, 19 Jul 2011 03:39:40 +0000 (13:39 +1000)]
Updated license headers.

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Mon, 18 Jul 2011 18:53:09 +0000 (04: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:
  Prevent failed rendering for NPOT textures in GLES2.
  Don't use GL_REPEAT for NPOT textures in GLES2.

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Mon, 18 Jul 2011 14:45:46 +0000 (00:45 +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:
  Avoid crash when surface creation fails.

10 years agoPrevent failed rendering for NPOT textures in GLES2.
Samuel Rødal [Mon, 18 Jul 2011 12:52:16 +0000 (14:52 +0200)]
Prevent failed rendering for NPOT textures in GLES2.

Shouldn't use the (default) GL_REPEAT wrap mode on GLES2 unless
GL_OES_texture_npot is present.

Reviewed-by: Kim
10 years agoDon't use GL_REPEAT for NPOT textures in GLES2.
Samuel Rødal [Fri, 15 Jul 2011 12:37:47 +0000 (14:37 +0200)]
Don't use GL_REPEAT for NPOT textures in GLES2.

We already handle NPOT textures correctly by calling fract() on the
texture coordinates in the fragment shader, but we also need to make
sure not to set GL_REPEAT as the wrap mode, because the GLES2 spec says
that the driver should return (0, 0, 0, 1) if an NPOT texture has wrap
mode different from GL_CLAMP_TO_EDGE. Previous GLES2-implementations
we've tested on have thus not been GLES2-compliant (or supported
GL_OES_texture_npot).

Partial back-port / modification of
c5a377e944f9a87c372ff8371c66b03d861803a6 in 4.8.

Reviewed-by: Kim
10 years agoAvoid crash when surface creation fails.
Laszlo Agocs [Mon, 18 Jul 2011 08:53:06 +0000 (11:53 +0300)]
Avoid crash when surface creation fails.

When the creation of the EGL window surface failed, the paint engine
was not destroyed in the openvg module's window surface implementation.
This led to accessing an obsolete engine instance later on in
QSymbianControl::Draw, leading to a crash. Now a new, proper engine
will be created, naturally the painting will still fail, but the
application will not crash.

Task-number: QTBUG-20339
Reviewed-by: Jani Hautakangas
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Mon, 18 Jul 2011 06:26:50 +0000 (16:26 +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 leaking X11 SyncCounter when widgets get open/destroyed

10 years agoFixes leaking X11 SyncCounter when widgets get open/destroyed
Aleksandar Stojiljkovic [Mon, 18 Jul 2011 05:46:01 +0000 (08:46 +0300)]
Fixes leaking X11 SyncCounter when widgets get open/destroyed

xmeminfo showed leaking memory and unreleased X11 SyncCounter for test application opening and destroying one QWidget.
It was not that critical: on 1000+ openings, heap grew ~4MB. This patch fixes the leak.

Reviewed-by: Samuel Rødal