qt:qt.git
10 years agoMerge branch 4.7 into qt-4.8-from-4.7
Sergio Ahumada [Tue, 23 Aug 2011 20:45:26 +0000 (22:45 +0200)]
Merge branch 4.7 into qt-4.8-from-4.7

Conflicts:
doc/src/index.qdoc

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, 23 Aug 2011 14:51:35 +0000 (00: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:
  Revert "Avoid calling QInputMethod update when adding or removing QGraphicsItems that don't have focus"
  Avoid calling QInputMethod update when adding or removing QGraphicsItems that don't have focus

10 years agoRevert "Avoid calling QInputMethod update when adding or removing QGraphicsItems...
Aleksandar Stojiljkovic [Tue, 23 Aug 2011 07:52:13 +0000 (10:52 +0300)]
Revert "Avoid calling QInputMethod update when adding or removing QGraphicsItems that don't have focus"

This reverts commit 090ff76845ca5b9c61319f359a94cc239b18846b ... due to failing unit tests.

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 agoAvoid calling QInputMethod update when adding or removing QGraphicsItems that don...
Aleksandar Stojiljkovic [Fri, 19 Aug 2011 14:16:35 +0000 (17:16 +0300)]
Avoid calling QInputMethod update when adding or removing QGraphicsItems that don't have focus

Removing item from QGraphicsScene takes longer if focus is in item (and that item is not being removed) with ItemAcceptsInputMethod.
update() in QInputContext or in subclasses could be expensive - usually requires inputMethodFocus and a sequence of inputMethodQuery calls to get the state. In MeeGo, additionally, dbus IPC in MInputContext makes it order of magnitude slower.
Minor indentation issue in QGraphicsViewPrivate::updateInputMethodSensitivity()

Reviewed-by: Samuel Rødal
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 into qt-4.8-from-4.7
Qt Continuous Integration System [Thu, 18 Aug 2011 16:04:01 +0000 (02:04 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7

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 agoMerge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Wed, 17 Aug 2011 16:03:30 +0000 (02:03 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7

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 into qt-4.8-from-4.7
Qt Continuous Integration System [Tue, 16 Aug 2011 16:04:06 +0000 (02:04 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7

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 agoMerge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Liang Qi [Tue, 16 Aug 2011 06:00:17 +0000 (08:00 +0200)]
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/gui/kernel/qwidget_s60.cpp

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 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Mon, 15 Aug 2011 15:38:48 +0000 (01:38 +1000)]
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  Revert accidental commit
  Rework threading internals in XmlListModel to avoid global static
  Fix undesirable VKB popup at task switch
  Fix compile errors on S60 3.2
  Fix to QGLWidget rendering with VG graphics system
  Symbian/gcce: Remove the useless -T flag
  Fix installation on S60 5.0
  Fix fancybrowser.pro
  Move cursorDelegate with the mouse selection of read only text input.
  Ignore child elements in non-application caption/pkg name translations
  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 remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Liang Qi [Mon, 15 Aug 2011 14:19:17 +0000 (16:19 +0200)]
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
examples/webkit/fancybrowser/fancybrowser.pro
src/3rdparty/libpng/ANNOUNCE
src/3rdparty/libpng/CHANGES
src/3rdparty/libpng/CMakeLists.txt
src/3rdparty/libpng/LICENSE
src/3rdparty/libpng/README
src/3rdparty/libpng/configure.ac
src/3rdparty/libpng/example.c
src/3rdparty/libpng/libpng-manual.txt
src/3rdparty/libpng/libpng.3
src/3rdparty/libpng/libpngpf.3
src/3rdparty/libpng/png.5
src/3rdparty/libpng/png.c
src/3rdparty/libpng/png.h
src/3rdparty/libpng/pngconf.h
src/3rdparty/libpng/pngerror.c
src/3rdparty/libpng/pnginfo.h
src/3rdparty/libpng/pnglibconf.h
src/3rdparty/libpng/pngmem.c
src/3rdparty/libpng/pngpread.c
src/3rdparty/libpng/pngpriv.h
src/3rdparty/libpng/pngread.c
src/3rdparty/libpng/pngrtran.c
src/3rdparty/libpng/pngrutil.c
src/3rdparty/libpng/pngset.c
src/3rdparty/libpng/pngstruct.h
src/3rdparty/libpng/pngtest.c
src/3rdparty/libpng/pngtrans.c
src/3rdparty/libpng/pngvalid.c
src/3rdparty/libpng/pngwrite.c
src/3rdparty/libpng/pngwtran.c
src/3rdparty/libpng/pngwutil.c
src/gui/dialogs/qfiledialog_symbian.cpp
src/gui/kernel/qsoftkeymanager.cpp
src/s60installs/s60installs.pro

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 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Mon, 15 Aug 2011 09:07:13 +0000 (19:07 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
  HTTP internals: send password even if no username is set

10 years agoHTTP internals: send password even if no username is set
Robert Hogan [Mon, 15 Aug 2011 08:43:43 +0000 (10:43 +0200)]
HTTP internals: send password even if no username is set

Setting only a password (no username) for HTTP requests does not
result in the password being sent.
Only cancel authentication if neither a username nor a password is set.
Requiring a username was preventing user-less logins.

Merge-request: 1250
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Task-number: QTBUG-15566

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 agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
Qt Continuous Integration System [Fri, 12 Aug 2011 13:03:28 +0000 (23:03 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:

10 years agoMerge remote-tracking branch 'qt-qml-review/master' into master-qml-staging
Kai Koehne [Fri, 12 Aug 2011 08:08:28 +0000 (10:08 +0200)]
Merge remote-tracking branch 'qt-qml-review/master' into master-qml-staging

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
Qt Continuous Integration System [Fri, 12 Aug 2011 06:56:24 +0000 (16:56 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
  Always disconnect signals on aborted reply objects

10 years agoAlways disconnect signals on aborted reply objects
Bea Lam [Fri, 12 Aug 2011 04:03:14 +0000 (14:03 +1000)]
Always disconnect signals on aborted reply objects

reload() did not disconnect the model from an aborted reply's
signals, and if it received a finished() signal from the aborted
reply it crashed when trying to access the deleted d->reply.

Task-number: QTBUG-20842

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
Qt Continuous Integration System [Fri, 12 Aug 2011 00:37:52 +0000 (10:37 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
  QmlInspector: Fix moc error
  QmlInspector: Fix compile for QT_NO_CURSOR
  QmlInspector: Remove unused toolbar
  JSDebugger: Only hit breakpoints in user code
  Prevent Binding from crashing when its target object is deleted.
  Cleanup QMLViewer properly when exiting via File->Quit.
  Fix crash when assigning a list property to transitions.
  Qml Debugging: only read properties that can be displayed in the debugger
  qmldump: Fix creation of objects from QDeclarativeTypes.
  Document state fast-forwarding.
  qmlplugindump: Update qmltypes file format documentation.

11 years agoMerge branch 'master' of ../qt-qml-staging
Michael Brasser [Thu, 11 Aug 2011 23:42:51 +0000 (09:42 +1000)]
Merge branch 'master' of ../qt-qml-staging

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Thu, 11 Aug 2011 17:14:57 +0000 (03:14 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
  Avoid spurious detaching in QDir::to/fromNativeSeparators
  Use fromLocal8Bit for reversing toLocal8Bit
  Don't convert template's path separators again
  Changed if/if/else/if/eleven chain to switch
  Modulus of negative dividends is undefined or negative
  Fix warning when compiling with VS 2008
  Re-introduce Q_GLOBAL_STATIC_INIT

11 years agoAvoid spurious detaching in QDir::to/fromNativeSeparators
João Abecasis [Fri, 5 Aug 2011 08:40:46 +0000 (10:40 +0200)]
Avoid spurious detaching in QDir::to/fromNativeSeparators

The new code avoids non-const detaching operations until needed and uses
a pointer into the "raw" QChar data from then on, thus skipping unneeded
checks on the reference count for further detaching.

These functions are used all the time by the file system classes so this
small optimization won't hurt. In particular, it will help users who
already use '/' when passing paths into Qt.

Reviewed-by: Peter Hartmann
11 years agoUse fromLocal8Bit for reversing toLocal8Bit
João Abecasis [Fri, 5 Aug 2011 08:32:51 +0000 (10:32 +0200)]
Use fromLocal8Bit for reversing toLocal8Bit

path is converted to 8-bit encoding using toLocal8Bit in
QTemporaryFileEngine::open. The reverse operation should be used here.

11 years agoDon't convert template's path separators again
João Abecasis [Fri, 5 Aug 2011 08:32:25 +0000 (10:32 +0200)]
Don't convert template's path separators again

11 years agoChanged if/if/else/if/eleven chain to switch
João Abecasis [Fri, 5 Aug 2011 08:32:08 +0000 (10:32 +0200)]
Changed if/if/else/if/eleven chain to switch

Inlined isdigit in switch statement. Removed unused #includes.
Documented unreachable segment with code (Q_ASSERT).

Reviewed-by: Denis Dzyubenko
11 years agoModulus of negative dividends is undefined or negative
João Abecasis [Fri, 5 Aug 2011 08:30:32 +0000 (10:30 +0200)]
Modulus of negative dividends is undefined or negative

... depending on who you ask. Since it is possible for applicationPid to
return negative values this means we would introduce garbage ['()*+,-./]
in the generated filenames.

Reviewed-by: Denis Dzyubenko
11 years agoFix warning when compiling with VS 2008
João Abecasis [Wed, 10 Aug 2011 16:11:25 +0000 (18:11 +0200)]
Fix warning when compiling with VS 2008

warning C4308: negative integral constant converted to unsigned type

11 years agoRe-introduce Q_GLOBAL_STATIC_INIT
João Abecasis [Fri, 5 Aug 2011 08:24:59 +0000 (10:24 +0200)]
Re-introduce Q_GLOBAL_STATIC_INIT

Removing this macro in abff4d5090c1706c44485bbe3689a0e339c26a9b breaks
code that used it in providing their own class-scope safe
Q_GLOBAL_STATIC variations, the feature introduced in that commit. There
may be other use cases for the macro.

Anyway, even if this isn't part of the public API, there isn't a strong
reason to remove the macro, so it is back now.

Task-number: QTBUG-20627
Reviewed-by: Samuel Rødal
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
Qt Continuous Integration System [Thu, 11 Aug 2011 11:26:41 +0000 (21:26 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
  Don't leak MouseEvents

11 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
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team
Qt Continuous Integration System [Thu, 11 Aug 2011 08:30:54 +0000 (18:30 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
  QmlInspector: Fix moc error
  QmlInspector: Fix compile for QT_NO_CURSOR
  QmlInspector: Remove unused toolbar
  JSDebugger: Only hit breakpoints in user code

11 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
11 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
11 years agoQmlInspector: Fix moc error
Kai Koehne [Thu, 11 Aug 2011 08:22:46 +0000 (10:22 +0200)]
QmlInspector: Fix moc error

Fix regression introduced in 857c7072320339a6ff1.

Change-Id: Ie08e8cd75055081976059a3af60b2c60a52260ee
Reviewed-by: TrustMe
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging
Alan Alpert [Thu, 11 Aug 2011 07:04:52 +0000 (17:04 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging

11 years agoDon't leak MouseEvents
Alan Alpert [Thu, 11 Aug 2011 06:59:06 +0000 (16:59 +1000)]
Don't leak MouseEvents

Based off merge request 1312

Reviewed-by: Michael Brasser
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
Qt Continuous Integration System [Thu, 11 Aug 2011 04:36:59 +0000 (14:36 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
  Fix race condition in processJobs()
  Don't endless loop
  Compile on symbian
  Don't release register prematurely
  Rework threading internals in XmlListModel to avoid global static
  Doc
  Doc
  Compile in namespace
  Fix alias warnings in QML compiled bindings
  Fix alias warnings in MetaCallArgument
  Fix alias warnings in QDeclarativeVME
  Fix alias warnings in QDeclarativeGuard

11 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

11 years agoFix race condition in processJobs()
Bea Lam [Thu, 11 Aug 2011 03:11:52 +0000 (13:11 +1000)]
Fix race condition in processJobs()

Don't modify list of running jobs when a job is aborted since the job
may have just started. Wait till the next time processJobs() is invoked
for a new job and discard the aborted job at that time.

Regression from 422f4e8ec53b917fad09a3e671fd93048dde72ed

Task-number: QTBUG-20841

11 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.

11 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

11 years agoQmlInspector: Fix compile for QT_NO_CURSOR
Kai Koehne [Wed, 10 Aug 2011 14:54:59 +0000 (16:54 +0200)]
QmlInspector: Fix compile for QT_NO_CURSOR

Change-Id: I0686ba006e6ab42dbd08cda6d36874d1c99009fe

11 years agoQmlInspector: Remove unused toolbar
Kai Koehne [Tue, 9 Aug 2011 11:36:05 +0000 (13:36 +0200)]
QmlInspector: Remove unused toolbar

This got disabled ages ago, but we never cleaned up the sources.

Change-Id: I69e7e5a431e2092ef925e48f81a306a3d316d2c7

11 years agoJSDebugger: Only hit breakpoints in user code
Kai Koehne [Tue, 9 Aug 2011 09:46:23 +0000 (11:46 +0200)]
JSDebugger: Only hit breakpoints in user code

Check that the topmost stack entry is a user defined ScriptFunction.
This avoids hitting the anonymous functions used for bindings, e.g.

onClicked: Qt.quit()

leads to script code

(function onClicked() { Qt.quit(); })

which will be hit twice for the debugger: Once for the function call
itself, then for the execution of Qt.quit().

Change-Id: Id431cacaef84172dc3474018cdf61f3dcc05cf93

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Wed, 10 Aug 2011 10:44:20 +0000 (20:44 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
  HTTP backend: invoke methods directly for synchronous requests

11 years agoHTTP backend: invoke methods directly for synchronous requests
Peter Hartmann [Wed, 10 Aug 2011 09:59:25 +0000 (11:59 +0200)]
HTTP backend: invoke methods directly for synchronous requests

when using synchronous requests, we need to invoke some methods
directly, e.g. "metaDataChanged" would otherwise not be called when
reading data from the cache.

Patch-by: Siddharth Mathur
Reviewed-by: Peter Hartmann
Task-number: QTBUG-20796

11 years agoDon't endless loop
Alan Alpert [Tue, 9 Aug 2011 04:23:50 +0000 (14:23 +1000)]
Don't endless loop

Task-number: QTBUG-20699
Reviewed-by: Michael Brasser
11 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

11 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
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Mon, 8 Aug 2011 09:44:03 +0000 (19:44 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
  uikit: update SDK setting for the simulator
  Add option to compare to different platform in lancelot autotest
  uikit: Use release Qt for simulator, update README
  Automatic closing of input panel on uikit when QML item looses focus.

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Fri, 5 Aug 2011 16:43:34 +0000 (02:43 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
  uikit: update SDK setting for the simulator

11 years agouikit: update SDK setting for the simulator
Eike Ziller [Fri, 5 Aug 2011 14:29:22 +0000 (16:29 +0200)]
uikit: update SDK setting for the simulator

11 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

11 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
11 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
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Fri, 5 Aug 2011 12:37:37 +0000 (22:37 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
  Add option to compare to different platform in lancelot autotest

11 years agoAdd option to compare to different platform in lancelot autotest
aavit [Fri, 5 Aug 2011 10:32:52 +0000 (12:32 +0200)]
Add option to compare to different platform in lancelot autotest

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Fri, 5 Aug 2011 08:23:27 +0000 (18:23 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
  uikit: Use release Qt for simulator, update README
  Automatic closing of input panel on uikit when QML item looses focus.

11 years agouikit: Use release Qt for simulator, update README
Eike Ziller [Fri, 5 Aug 2011 07:18:58 +0000 (09:18 +0200)]
uikit: Use release Qt for simulator, update README

11 years agoAutomatic closing of input panel on uikit when QML item looses focus.
Eike Ziller [Fri, 5 Aug 2011 06:43:24 +0000 (08:43 +0200)]
closing of input panel on uikit when QML item looses focus.

I.e. we remember which item had focus when we got the request to open
the input panel, and close it when that looses focus, even if we don't
get an explicit close request.

Also set the "returnKey" to "Return" instead of "Done" if the focus item
is a TextEdit.

This adds a dependency of the platform plugin to declarative.

11 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

11 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>