Qt Continuous Integration System [Fri, 2 Sep 2011 16:08:26 +0000 (02:08 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Fri, 2 Sep 2011 08:00:14 +0000 (18:00 +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:
URLs used with scheme handler use appropriate encoding for scheme
Qt Continuous Integration System [Fri, 2 Sep 2011 04:14:33 +0000 (14:14 +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 readonly BorderImage::sourceSize change
Martin Jones [Thu, 1 Sep 2011 23:04:37 +0000 (09:04 +1000)]
Revert readonly BorderImage::sourceSize change
Revert
a32728ce8cf4fa1d1dc1001b1fadc66e9c86e025
Writing to BorderImage sourceSize has never been allowed and issued
a warning, however this should not have been enforced in a patch
release.
Change-Id: I8f8d10e6ccd4e771fd38a27ce9d68f921b761d96
Task-number: QTTH-1501
mread [Thu, 1 Sep 2011 13:11:33 +0000 (14:11 +0100)]
URLs used with scheme handler use appropriate encoding for scheme
URLs passed to scheme handler always used to use raw encoding.
That broke URLs containing spaces passed to the browser.
Then QTBUG-18772 changed it so that they always used % encoding.
That broke URLs containing spaces used to open files, resulting
in QTBUG-21209.
This change fixes it so that web URLs are % encoded and file
URLs are raw encoded.
Task-number: QTBUG-21209
Reviewed-by: Honglei Zhang
Sergio Ahumada [Thu, 1 Sep 2011 10:45:36 +0000 (12:45 +0200)]
Merge branch 4.8 into qt-4.8-from-4.7
Conflicts:
tools/qdoc3/ditaxmlgenerator.cpp
tools/qdoc3/htmlgenerator.cpp
Sergio Ahumada [Thu, 1 Sep 2011 10:32:03 +0000 (12:32 +0200)]
Merge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Thu, 1 Sep 2011 04:27:51 +0000 (14: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 memory leak in ListModel custom parser
Bea Lam [Thu, 1 Sep 2011 04:00:16 +0000 (14:00 +1000)]
Fix memory leak in ListModel custom parser
ModelNodes created by the parser for ListElement definitions were not
deleted.
(Commit backported from
c1491c356f3cca92a359468ce37f38bc1873eec4
in qt-qml-staging)
Task-number: QTBUG-21084
Change-Id: I36ca0ffba1a94355abe42a95e49723548d9a575a
Reviewed-by: Michael Brasser
Qt Continuous Integration System [Wed, 31 Aug 2011 21:13:57 +0000 (07:13 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Designer: Fix static linking.
Qt Continuous Integration System [Wed, 31 Aug 2011 16:54:52 +0000 (02: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:
DEF file update
If automatic translation of input widget is off, skip reset
Prevent leakage of native window handles
Qt Continuous Integration System [Wed, 31 Aug 2011 16:34:02 +0000 (02:34 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (25 commits)
qdoc3: Updates to qdoc to print error message in ALL CAPS
Doc: Added a note to Code Editor example docs
Doc: QItemDelegate->QStyledItemDelegate in Star Delegate docs
Doc: Added a link in Symbian Intro to Required Capabilities
Doc: Added info on ordered targets for VS to qmake manual
Doc: Small addition to the QML anchor layout docs
Doc: Internalized QDeclarativeTypeLoader
Doc: Said that QIODevice::isSequential returns false by default
Doc: Said that QList::clear deallocates memory
Doc: Updated platform notes for MultiMedia and Phonon
Doc: Added links to the plugin deployment guide.
Doc: Fix doc bug in QMouseEvent
Doc: Fixed doc bug in QMetaObject
Doc: Fixed date format doc bug in QDateTime/Qt namespace
Doc: Removed internal Phonon classes from doce
qdoc3: Updates for QTBUG-20776; include fileToOpen path.
qdoc3: Updates for QTBUG-20776; clear map between runs.
qdoc3: Updates for QTBUG-20739 (no read-only for QML components)
qdoc3: Updates for QTBUG-20776 and QTBUG-20777
qdoc: Check pointer for null before dereferencing.
...
Gareth Stockwell [Wed, 31 Aug 2011 16:10:44 +0000 (17:10 +0100)]
DEF file update
Reviewed-by: TrustMe
Jarek Kobus [Wed, 31 Aug 2011 14:11:47 +0000 (16:11 +0200)]
Designer: Fix static linking.
Fix a regression introduced by change
e7762b60d519c9ae4b47f6c4ceece584408247ea working
around an issue caused by changing the behaviour of qFindChild<> in
99160bb9f851bf02fe5345b5f52217b6c77a57c4.
Reviewed-by: Friedemann Kleint <qtc-committer@nokia.com>
Task-number: QTBUG-21173
Qt Continuous Integration System [Wed, 31 Aug 2011 12:20:26 +0000 (22:20 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix build with Clang for libpng versions 1.4.0 to 1.5.2
Sergio Ahumada [Wed, 31 Aug 2011 11:54:04 +0000 (13:54 +0200)]
Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7
Conflicts:
src/network/ssl/qsslcertificate.cpp
Liang Qi [Wed, 31 Aug 2011 11:15:17 +0000 (13:15 +0200)]
Merge branch 'qt-4.7' into 4.7
Conflicts:
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
Tor Arne Vestbø [Tue, 30 Aug 2011 14:15:07 +0000 (16:15 +0200)]
Fix build with Clang for libpng versions 1.4.0 to 1.5.2
Versions 1.4.0 to 1.5.2 of libpng declare png_longjmp_ptr to
have a noreturn attribute if PNG_PEDANTIC_WARNINGS_SUPPORTED
is enabled, but most declarations of longjmp in the wild do
not add this attribute. This causes problems when the png_jmpbuf
macro expands to calling png_set_longjmp_fn with a mismatched
longjmp, as compilers such as Clang will treat this as an error.
To work around this we override the png_jmpbuf macro to cast
longjmp to a png_longjmp_ptr.
See also http://llvm.org/bugs/show_bug.cgi?id=10338
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Sami Merila [Wed, 31 Aug 2011 09:23:33 +0000 (12:23 +0300)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Sami Merila [Wed, 31 Aug 2011 09:21:15 +0000 (12:21 +0300)]
If automatic translation of input widget is off, skip reset
If there is an existing transformataion in use and application has
indicated that it won't use automatic translation of input widget
when using spliview, do not reset the transformation as this will
also remove the original transformation.
Task-number: QT-5225
Reviewed-by: Miikka Heikkinen
Gareth Stockwell [Thu, 11 Aug 2011 12:58:23 +0000 (13:58 +0100)]
Prevent leakage of native window handles
On Symbian, reparenting a native widget causes its native window,
and those of all its ancestors, to be destroyed and recreated.
Because native window handles cannot be destroyed from the context
of CONE event handlers, the destruction is delayed until after
control flow returns to the event loop (see QTBUG-4664).
However, the pending-destruction native windows are leaked if
either of the following happens:
a) The application never returns to the event loop. While unlikely
in a real app, this situation does happen in Qt autotests, causing
a crash in tst_qwidget due to leakage from
tst_QWidget::reparentCausesChildWinIdChange().
b) A subsequent reparenting event occurs before control returns to
the event loop.
This patch prevents the leak by storing the pending-destruction
native window handle(s) in a member QList, rather than on the stack
as parameters to QWidgetPrivate::_q_delayedDestroy(WId).
Task-number: QT-5135
Reviewed-by: Jani Hautakangas
Casper van Donderen [Wed, 31 Aug 2011 08:14:28 +0000 (10:14 +0200)]
Merge remote branch 'mainline/4.8'
Conflicts:
tools/qdoc3/cppcodemarker.cpp
tools/qdoc3/node.cpp
Sergio Ahumada [Wed, 31 Aug 2011 07:38:52 +0000 (09:38 +0200)]
Merge branch 4.7 into qt-4.8-from-4.7
Conflicts:
doc/src/index.qdoc
Casper van Donderen [Wed, 31 Aug 2011 07:37:17 +0000 (09:37 +0200)]
Merge remote branch 'qt-doc-review/master'
Conflicts:
doc/src/declarative/righttoleft.qdoc
tools/qdoc3/generator.h
Qt Continuous Integration System [Wed, 31 Aug 2011 07:28:23 +0000 (17:28 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Fix Symbian system date format parsing.
Fix QXmlSimpleReader auto test failer
Fix pointer event mapping when windows are fixed to native orientation
Fix incorrect Symbian version check.
Fix BLD_INF_RULES.prj_exports statements in Qt libs for shadow builds.
Improved support for shadow builds in Symbian.
Fix def file paths for Symbian shadow builds
Giving QUuid::createUuid() more entropy on Symbian
Enable running of XQuery test suite
QXmlSimpleReader handle external entity reference file over 1k
Qt Continuous Integration System [Wed, 31 Aug 2011 01:46:11 +0000 (11:46 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
don't crash when destroying the shortcuts
Disable activeqt on win32-g++ (it doesn't build).
fix warning
remove unused functions
Make the DBus timeout configurable in QDBusAbstractInterface.
Fix a typo in qt-conf docs.
Revert "Fix build with the Clang compiler"
Added missing no_include_pwd check
Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'
Fix build with the Clang compiler
Change spacing of title in offline style.
Add support for rawFonts loaded from data in FaceId
examples: fix compilation with namespaced Qt.
Russian translation update
Update Japanese translations for Qt 4.8.
directfb: Include directfbgl.h directly
tests: fix QNetworkProxyFactory test
don't detach until the list is going to be modified
optimize QList::removeAll()
Qt Continuous Integration System [Tue, 30 Aug 2011 21:10:39 +0000 (07:10 +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:
QSslCertificate: also check common name for blacklisted certificates
QSslCertificate: regenerate blacklisted certificates, they were expired
QSslCertificate: blacklist fraudulent *.google.com
Qt Continuous Integration System [Tue, 30 Aug 2011 19:15:19 +0000 (05:15 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Fix Symbian system date format parsing.
Qt Continuous Integration System [Tue, 30 Aug 2011 12:45:56 +0000 (22:45 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
Doc: added since tag to QDateTime::msecsTo
Miikka Heikkinen [Tue, 30 Aug 2011 11:58:33 +0000 (14:58 +0300)]
Fix Symbian system date format parsing.
System date format parsing didn't work correctly when the format was
locale-dependent (i.e. didn't have %F). The abbreviations of day,
month, and year where not taken into account if they were specified
in their proper place, i.e. with %*D, %*M, or %*Y parameter.
Task-number: QT-5237
Reviewed-by: Sami Merila
Honglei Zhang [Tue, 30 Aug 2011 14:42:15 +0000 (17:42 +0300)]
Fix QXmlSimpleReader auto test failer
Bug fix for QTBUG-21025 has introduced a auto test failure. One added
xml file has typo and failed a test driver. The extra charactor is
removed from the test xml file.
Task-number: QTBUG-21025
Reviewed-by: Trust Me
Qt Continuous Integration System [Tue, 30 Aug 2011 12:12:40 +0000 (22:12 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Fix QXmlSimpleReader auto test failer
Fix pointer event mapping when windows are fixed to native orientation
Fix incorrect Symbian version check.
Fix BLD_INF_RULES.prj_exports statements in Qt libs for shadow builds.
Improved support for shadow builds in Symbian.
Fix def file paths for Symbian shadow builds
Giving QUuid::createUuid() more entropy on Symbian
Enable running of XQuery test suite
QXmlSimpleReader handle external entity reference file over 1k
Qt Continuous Integration System [Tue, 30 Aug 2011 11:45:44 +0000 (21:45 +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:
QSslCertificate: blacklist fraudulent *.google.com
Peter Hartmann [Tue, 30 Aug 2011 09:33:01 +0000 (11:33 +0200)]
QSslCertificate: blacklist fraudulent *.google.com
blacklist the leaf certificate for now. There might well be more fake
certificates in the wild, for that either the Diginotar.nl root cert
needs to be disabled on the system or OCSP would need to be enabled
(not supported by Qt yet).
Reviewed-by: Richard J. Moore <rich@kde.org>
Peter Hartmann [Tue, 30 Aug 2011 11:10:06 +0000 (13:10 +0200)]
QSslCertificate: also check common name for blacklisted certificates
... to reduce the possibility of blacklisting valid certificates that
happen to have the same serial number as a blacklisted one, which is
unlikely, but possible.
Reviewed-by: Richard J. Moore <rich@kde.org>
Peter Hartmann [Tue, 30 Aug 2011 10:24:30 +0000 (12:24 +0200)]
QSslCertificate: regenerate blacklisted certificates, they were expired
regenerating blacklisted certificates with same serial number and
common name, but longer validity: Now they are valid for 10 years.
Konstantin Ritt [Tue, 30 Aug 2011 08:34:31 +0000 (12:34 +0400)]
don't crash when destroying the shortcuts
as shortcutDestroyed(..) modifies the shortcuts list.
disconnect from shortcutDestroyed() first, or operate on a detach()-ed list
this was uncovered by QList::removaAll() optimization patch.
Joerg Bornemann [Tue, 30 Aug 2011 09:43:17 +0000 (11:43 +0200)]
Doc: added since tag to QDateTime::msecsTo
Peter Hartmann [Tue, 30 Aug 2011 09:33:01 +0000 (11:33 +0200)]
QSslCertificate: blacklist fraudulent *.google.com
blacklist the leaf certificate for now. There might well be more fake
certificates in the wild, for that either the Diginotar.nl root cert
needs to be disabled on the system or OCSP would need to be enabled
(not supported by Qt yet).
Reviewed-by: Richard J. Moore <rich@kde.org>
Qt Continuous Integration System [Tue, 30 Aug 2011 09:33:03 +0000 (19:33 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (193 commits)
qdoc3: Updates to qdoc to print error message in ALL CAPS
Fix conversion of QAbstractItemModel::rowsMoved() parameters
Do not unconditionally use pkg-config in .pro files
Updated WebKit to
dda59e50379214c098f365a39c4d64b39ced427e
Revert "Don't second-guess the "engine"; call cleanPath on absolutePaths"
Revert "In 4.7 QFileInfo::absolute(File)Path returned clean paths"
In 4.7 QFileInfo::absolute(File)Path returned clean paths
Porting the QTBUG-21084 fix to 4.7.4
ret is an "internal" path, no need to re-process it
We prefer capitalized drive letters, make it so sooner
Don't second-guess the "engine"; call cleanPath on absolutePaths
Compare non-canonical paths before falling back on expensive computation
Fix QDir::operator==(const QDir &) const
Fixed use of deleted object in XmlPatterns EvaluationCache
Check if bridge plugin vector is still valid.
Updated WebKit to
85d4df147ac7b239497b05979a51fd6fde7580fd
Updated WebKit to
836fa24be73978fb292e954abb151fb46b1d97e0
uikit: get rid of the "min 30fps" for event handling.
uikit: update README
Doc: Added a note to Code Editor example docs
...
Casper van Donderen [Tue, 30 Aug 2011 08:44:54 +0000 (10:44 +0200)]
Merge branch '4.8'
Conflicts:
doc/src/declarative/righttoleft.qdoc
Casper van Donderen [Tue, 30 Aug 2011 08:40:03 +0000 (10:40 +0200)]
Merge remote branch 'mainline/4.8'
Qt Continuous Integration System [Tue, 30 Aug 2011 08:18:02 +0000 (18:18 +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:
QDeclarative::hasActiveFocus should return false for hidden items
FocusScope's focusItem must always be a descendent
Alan Alpert [Tue, 30 Aug 2011 08:03:32 +0000 (18:03 +1000)]
QDeclarative::hasActiveFocus should return false for hidden items
In graphics view you can be the focus item without being visible,
but you still won't receive events. QML should hide these distinctions.
Task-number: QTBUG-21045
Alan Alpert [Mon, 15 Aug 2011 03:44:44 +0000 (13:44 +1000)]
FocusScope's focusItem must always be a descendent
Task-number: QTBUG-20699
Reviewed-by: Michael Brasser
Qt Continuous Integration System [Tue, 30 Aug 2011 07:29:00 +0000 (17:29 +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: (26 commits)
Symbian: Not possible to catch RequestSoftwareInputPanel in eventFilter
Added an additional check to workaround an issue on Windows.
Exact word bubble doesn't disappear when screen is tapped (fix part 2)
Exact word bubble doesn't disappear when screen is tapped
Compile fix for Symbian 5th and earlier
Symbian: Fix backspace on empty lines of multiline textedits
Handle CloseSoftwareInputPanel event in QCoeFepInputContext
Fix delayed password masking mid-string.
Disabled splitscreen translation still moves screen
Make text rendering working outside the gui thread on Symbian.
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
Revert accidental commit
Rework threading internals in XmlListModel to avoid global static
Fix undesirable VKB popup at task switch
Doc: Clarified the range of return values from QLineF::angle().
Doc: Fixed \since declarations. (cherry picked from commit
358e018dbb4b4dbdbfc702a6d462f113a1357e1e)
Doc: Standardized on QtQuick for \since declarations. (cherry picked from commit
609dc22f719ecb8d48349fd56f84960bbf46d731)
...
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
(cherry picked from commit
076ac0ee55b54ae3759af76cf5790e31fbd0f7e5)
Reapplied after bad v4.7.4 merge
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)
(cherry picked from commit
d62bb74d329b6ee5f6c52ac26e11bfe9a27f56a0)
Reapplied after bad v4.7.4 merge
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
(cherry picked from commit
b186288cbf796be662f86ae4d5c70e39ba6afb67)
Reapplied after bad v4.7.4 merge
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
(cherry picked from commit
1679b2d71f4f573699aad20aebf4eacc7605fdc8)
Reapplied after bad v4.7.4 merge
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
(cherry picked from commit
95df5be87b37da139dba33b06aaf6e2a251be698)
Reapplied after bad v4.7.4 merge
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
(cherry picked from commit
a2709ef3f4410a1d1755e00353e6f969f8bb5613)
Reapplied after bad v4.7.4 merge
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
(cherry picked from commit
5aef1b278488fb889e298ce858ae299b83edf5ed)
Reapplied after bad v4.7.4 merge
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
(cherry picked from commit
b98e9e69dd8ba33d5f01b9518d95b63b86c4b443)
Reapplied after bad v4.7.4 merge
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
(cherry picked from commit
de12ff38f2be5362321aa8e79cfbfd9692e18ab0)
Reapplied after bad v4.7.4 merge
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)
(cherry picked from commit
13e7d402c438fd2c527dbc302cf1103d5c835a2f)
Reapplied after bad v4.7.4 merge
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
(cherry picked from commit
1dc0a2ccd645abd26b13fd67313a03bbc722a74d)
Reapplied after bad v4.7.4 merge
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
(cherry picked from commit
15b44c1ea04c3beebe4d7f6d9f45b81127c3c8f9)
Reapplied after bad v4.7.4 merge
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
(cherry picked from commit
e9040d183dce6188ae9d1493167cb7247a6d4a7b)
Reapplied after bad v4.7.4 merge
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
(cherry picked from commit
d4a2ce8ad5be6633f0e5c5a74eaa8b9c32c02ba8)
Reapplied after bad v4.7.4 merge
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.
(cherry picked from commit
d30334bfdf5a05d6ea3c68e4014ce8f8d66f3876)
Reapplied after bad v4.7.4 merge
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
(cherry picked from commit
7a80c5d656e5492dc026cbf643847d7f9c50324a)
Reapplied after bad v4.7.4 merge
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
(cherry picked from commit
6a3b5c13ac40c18951efd8be1e3506606da0f6f9)
Reapplied after bad v4.7.4 merge
David Boddie [Thu, 30 Jun 2011 18:48:32 +0000 (20:48 +0200)]
Doc: Clarified the range of return values from QLineF::angle().
Task-number: QTBUG-20197
(cherry picked from commit
86608d537eabc3cf7e1d1ddd1d0a2f90ccc2de2a)
Reapplied after bad v4.7.4 merge
David Boddie [Thu, 30 Jun 2011 17:16:21 +0000 (19:16 +0200)]
Doc: Fixed \since declarations.
(cherry picked from commit
358e018dbb4b4dbdbfc702a6d462f113a1357e1e)
Reapplied after bad v4.7.4 merge
David Boddie [Thu, 30 Jun 2011 17:14:30 +0000 (19:14 +0200)]
Doc: Standardized on QtQuick for \since declarations.
(cherry picked from commit
609dc22f719ecb8d48349fd56f84960bbf46d731)
Reapplied after bad v4.7.4 merge
David Boddie [Thu, 30 Jun 2011 17:13:55 +0000 (19:13 +0200)]
Doc: Removed whitespace.
(cherry picked from commit
01b3f508d1f7e9951baf60f487feadfa98ba4751)
Reapplied after bad v4.7.4 merge
David Boddie [Thu, 30 Jun 2011 17:08:43 +0000 (19:08 +0200)]
Modified \since command behavior slightly to handle project and version.
(The since argument can contain a project name and version, defaulting
to the qdoc project if only a version number is specified.)
Refactored common code into the Generator class.
Fixed \sincelist HTML generation for tables containing only one item.
(cherry picked from commit
6a2f18140bbc41207eb2f5e2323b699600d89606)
Reapplied after bad v4.7.4 merge
David Boddie [Thu, 16 Jun 2011 18:24:11 +0000 (20:24 +0200)]
Doc: Added a simple introduction to Qt and fixed links.
(cherry picked from commit
9ed61311bce15b8f1bb4b30ee9133f1a2355f41d)
Reapplied after bad v4.7.4 merge
David Boddie [Thu, 16 Jun 2011 18:20:50 +0000 (20:20 +0200)]
Doc: Added more appropriate links to help reduce confusion.
Task-number: QTBUG-19919
(cherry picked from commit
26c29a2dd7efa4c66063d1255e1f694462cbae85)
Reapplied after bad v4.7.4 merge
David Boddie [Thu, 16 Jun 2011 14:10:38 +0000 (16:10 +0200)]
Doc: Removed non-ASCII characters from the documentation.
(cherry picked from commit
1bd6f1bd280ee6e1ecd4de2291c8ccfb4d06b7a4)
Reapplied after bad v4.7.4 merge
Martin Smith [Mon, 16 May 2011 09:28:00 +0000 (11:28 +0200)]
qdoc: Fixed QTBUG-19338
(cherry picked from commit
1ea0e706981006c48ad16a1ff8051df03610f20b)
Reapplied after bad v4.7.4 merge
Qt Continuous Integration System [Mon, 29 Aug 2011 21:19:18 +0000 (07:19 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
Do not unconditionally use pkg-config in .pro files
Updated WebKit to
dda59e50379214c098f365a39c4d64b39ced427e
Updated WebKit to
85d4df147ac7b239497b05979a51fd6fde7580fd
Updated WebKit to
836fa24be73978fb292e954abb151fb46b1d97e0
Updated WebKit to
4277f8277b1daf3ec33c996f5a760ccd1113af4b
Updated WebKit to
8ed79cb10ca72b5d240beae674a7932963cbd007
Updated WebKit to
66b76cdb8ef823f27a8229c5cae2d35e7f2d3c59
Sergio Ahumada [Mon, 29 Aug 2011 19:09:25 +0000 (21:09 +0200)]
Merge remote-tracking branch 'review/master'
Martin Smith [Mon, 29 Aug 2011 13:43:56 +0000 (15:43 +0200)]
qdoc3: Updates to qdoc to print error message in ALL CAPS
when the path argument for an \example command
refers to a directory that does not exist.
Task-number: QTBUG-21165
Laszlo Agocs [Mon, 29 Aug 2011 10:24:53 +0000 (13:24 +0300)]
Fix pointer event mapping when windows are fixed to native orientation
When the "fix native orientation" feature is enabled via
WA_SymbianNoSystemRotation, QSymbianControl has to do an extra
mapping for all pointer events because in this special mode the
RWindow and thus the CCoeControl will "rotate" (i.e. will change
their dimensions according to the orientation of the device),
however the EGL window surface and the QWidget will remain locked
to the native orientation of the device (typically portrait).
This means that the pointer events will correspond to the current
orientation of the device, which is not what Qt wants: typically
a graphics view or similar will perform the transformation of the
input events too, and therefore passing already-transformed events
is wrong (as it would result in double transformation). To solve
this, all pointer event coordinates are mapped back to the native
orientation.
This had a problem however: It only took the traditional portrait
and landscape modes into account. When there are two landscape modes
(i.e. rotations of both 90 and 270 degrees are supported), the
mapping of pointer events generated wrong results in one of them
because they treated them the same. The patch corrects this, so all
three orientations will result in proper input behavior, even when
NoSystemRotation is set.
Task-number: QT-5236
Reviewed-by: Sami Merila
Casper van Donderen [Mon, 29 Aug 2011 08:53:38 +0000 (10:53 +0200)]
Merge remote branch 'qt-doc-team/4.8'
Conflicts:
doc/src/declarative/righttoleft.qdoc
tools/qdoc3/ditaxmlgenerator.cpp
tools/qdoc3/generator.h
tools/qdoc3/htmlgenerator.cpp
Sergio Ahumada [Mon, 29 Aug 2011 08:51:04 +0000 (10:51 +0200)]
Merge remote-tracking branch 'upstream/4.8'
Conflicts:
tools/qdoc3/cppcodemarker.cpp
Qt Continuous Integration System [Mon, 29 Aug 2011 07:53:55 +0000 (17:53 +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 conversion of QAbstractItemModel::rowsMoved() parameters
Bea Lam [Mon, 29 Aug 2011 06:35:23 +0000 (16:35 +1000)]
Fix conversion of QAbstractItemModel::rowsMoved() parameters
VisualDataModel was emitting itemsMoved() signal with incorrect
"to" value when multiple items were moved forwards.
Reviewed-by: Martin Jones
Qt Continuous Integration System [Sun, 28 Aug 2011 15:03:37 +0000 (01:03 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Default graphics memory quota for Symbian applications
Fix warning about missing qs60keycapture_p.h header in gui
Reimplement MR1271 over coda patch
Fixed Symbian memory leak in utcToLocal(QDate &, QTime &)
Fix bad merge on a couple of xml examples
DEF file freeze
Qt Continuous Integration System [Sun, 28 Aug 2011 08:53:38 +0000 (18:53 +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:
Porting the QTBUG-21084 fix to 4.7.4
Qt Continuous Integration System [Sun, 28 Aug 2011 02:18:40 +0000 (12:18 +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: get rid of the "min 30fps" for event handling.
uikit: update README
Fix QGLGlyphCache for Open GL ES (1).
Revert "Include trailing space width in RTL text line width"
Fix justification of RTL text
uikit: fix examples to no longer ship the custom fonts
Use CoreText for font rendering on uikit.
Qt Continuous Integration System [Sat, 27 Aug 2011 16:04:06 +0000 (02:04 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Sat, 27 Aug 2011 14:14:32 +0000 (00:14 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Check if bridge plugin vector is still valid.
QWindowsStyle: fix bug in eventFilter on KeyPressed event with alt pressed: incorrect work with list
Qt Continuous Integration System [Sat, 27 Aug 2011 08:08:21 +0000 (18:08 +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: (21 commits)
Revert "Don't second-guess the "engine"; call cleanPath on absolutePaths"
Revert "In 4.7 QFileInfo::absolute(File)Path returned clean paths"
In 4.7 QFileInfo::absolute(File)Path returned clean paths
ret is an "internal" path, no need to re-process it
We prefer capitalized drive letters, make it so sooner
Don't second-guess the "engine"; call cleanPath on absolutePaths
Compare non-canonical paths before falling back on expensive computation
Fix QDir::operator==(const QDir &) const
Off-by-one error in assert condition...
Leftovers from
401722ef9e6fe79bd41f9d5f79668f5c4997c8e6
Merged fileTemplate test with QTBUG_4796
Cleanup code: removing empty stubs
Fix QTemporaryFile regressions and new found issues
Use "native paths" on POSIX platforms as well
Cleanup #includes
Add output on test failure
Atomic implementation of create file and obtain handle for Win/Symbian
Minimize encoding conversions when generating unique file name
Use QStringBuilder when copying template for modification
Make Symbian follow Windows code in temporary path generation
...
Qt Continuous Integration System [Sat, 27 Aug 2011 02:57:03 +0000 (12:57 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team: (246 commits)
Do not unconditionally use pkg-config in .pro files
Updated WebKit to
dda59e50379214c098f365a39c4d64b39ced427e
Updated WebKit to
85d4df147ac7b239497b05979a51fd6fde7580fd
Updated WebKit to
836fa24be73978fb292e954abb151fb46b1d97e0
Updated WebKit to
4277f8277b1daf3ec33c996f5a760ccd1113af4b
Updated WebKit to
8ed79cb10ca72b5d240beae674a7932963cbd007
Updated WebKit to
66b76cdb8ef823f27a8229c5cae2d35e7f2d3c59
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.
Fixed compile error in qwindowsurface_qws.cpp.
Fixed regression introduced by
5842d19cf3dff37a85c.
Remove DerivedSources.pro from WebKit.
Support debuggable in the makefile build system
QLabel documentation: add warning about sanitizing input
runonphone: fix failure to terminate
Fix license headers in new files from coda patch
runonphone: command line args improperly passed to TRK after CODA patch
Mark all Symbian debug binaries debuggable by default
...
Qt Continuous Integration System [Sat, 27 Aug 2011 01:43:46 +0000 (11:43 +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:
Fixed use of deleted object in XmlPatterns EvaluationCache
Crash when creating scroll bar skin graphics on S60 (debug only)
QS60Style omits drawing theme background in some Symbian SDKs
Fix for qml1shaderplugin GPU resource handling on Symbian
Make it easier to select words at the start of a line.
Doc: Fixing typo
In landscape mode QComboboBox popup can not be showed completely
Fix left alignment of native RTL pre-edit text.
Sergio Ahumada [Fri, 26 Aug 2011 21:42:57 +0000 (23:42 +0200)]
Merge branch 4.7 into qt-4.8-from-4.7
Conflicts:
doc/src/index.qdoc
src/xmlpatterns/expr/qevaluationcache_p.h
Rohan McGovern [Thu, 18 Aug 2011 23:03:51 +0000 (09:03 +1000)]
Do not unconditionally use pkg-config in .pro files
Using the first pkg-config in PATH is prone to errors when
cross compiling. This is a known issue, and `configure' already
avoids using pkg-config for cross compiling (unless -force-pkg-config is
used). However, there was previously no way for a .pro file to test
whether or not the user had passed -force-pkg-config.
Let !contains(QT_CONFIG, no-pkg-config) be used to test whether or not it
is safe to run pkg-config.
Ademar de Souza Reis Jr [Fri, 26 Aug 2011 21:12:05 +0000 (18:12 -0300)]
Qt Continuous Integration System [Fri, 26 Aug 2011 21:06:26 +0000 (07: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:
Porting the QTBUG-21084 fix to 4.7.4
João Abecasis [Fri, 26 Aug 2011 15:58:27 +0000 (17:58 +0200)]
Revert "Don't second-guess the "engine"; call cleanPath on absolutePaths"
This reverts commit
07afddbf4bc029f776810381c7317fffa100eb60.
This breaks QDir autotests on windows.
João Abecasis [Fri, 26 Aug 2011 15:33:47 +0000 (17:33 +0200)]
Revert "In 4.7 QFileInfo::absolute(File)Path returned clean paths"
This reverts commit
2e32fca2c0f5252864d348df929d9858486763b1.
The fix there is incorrect as it breaks QFileInfo autotests.
João Abecasis [Fri, 26 Aug 2011 15:09:01 +0000 (17:09 +0200)]
In 4.7 QFileInfo::absolute(File)Path returned clean paths
Let's play nice and keep that "feature".
Task-number: QTBUG-19995
Qt Continuous Integration System [Fri, 26 Aug 2011 13:17:29 +0000 (23:17 +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 memory leak in ListModel custom parser
Correct documentation of TextInput.PasswordEchoOnEdit.
mread [Fri, 26 Aug 2011 12:30:53 +0000 (13:30 +0100)]
Porting the QTBUG-21084 fix to 4.7.4
This fixes a memory leak. It's SR1 tagged for 4.7.4.
Task-number: QTBUG-21084
Reviewed-by: Honglei Zhang
João Abecasis [Fri, 26 Aug 2011 09:01:48 +0000 (11:01 +0200)]
ret is an "internal" path, no need to re-process it
Where "internal" means that it uses Qt's separator '/', regardless of
the native one.
João Abecasis [Fri, 26 Aug 2011 09:03:55 +0000 (11:03 +0200)]
We prefer capitalized drive letters, make it so sooner
Reviewed-by: Prasanth Ullattil
João Abecasis [Fri, 26 Aug 2011 08:39:52 +0000 (10:39 +0200)]
Don't second-guess the "engine"; call cleanPath on absolutePaths
This ensures there is a single definition of what constitutes an
absolute path in Qt.
Task-number: QTBUG-19995
Reviewed-by: Prasanth Ullattil