| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Migrate addMarkUp function to QChar.
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
Migrate addMarkUp function to QChar.
update the proxy info before session is opened in QNAM by Aapo Makela
Dragging in nested views no longer works as expected
QSslCertificate: block all DigiNotar (intermediate and root) certs
QSslCertificate: also check common name for blacklisted certificates
Fix implicit height not growing when pre-edit text wraps.
Fix typo in header guard.
fix doc typo
Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdk
remove obsolete define
Fix leak in State element.
Fix leak in bindings created by PropertyChanges.
|
| | |\ |
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Martin Smith
|
|\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
StrictlyEnforceRange with snapOneItem/Row and header behavior change
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change cf23188de237009136fa1480ab8fd9e3ca364769 changed the positioning
of a view with StrictlyEnforceRange, snapOneItem/Row, and a header,
such that the view was positioned at the beginning of the header,
rather than on the first item. This change reverts back to the old
behavior (position on the first item).
Change-Id: I62ad183919bb2ed83d787d1d76421caf9e708599
Task-number: QTTH-1501
Reviewed-by: Michael Brasser
|
|\ \ \ \ \ \
| |_|_|_|_|/
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Release font engine refcount when done using it in QTextEngine
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
5f2b6dd2a50275bc05ae5d7e9dd8902d6d49d9df increased refcounts for
font engines in QTextEngine cache, we need to decrease them when
the QTextEngine is deallocated.
Task-number: QTBUG-21222
Reviewed-by: Eskil
|
|\ \ \ \ \ \
| |_|_|_|_|/
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
update the proxy info before session is opened in QNAM by Aapo Makela
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-By: Kranthi Kuntala <kranthi.kumar-kuntala@nokia.com>
|
|\ \ \ \ \ \
| | |_|_|/ /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Fix assert error on Windows with a negative char.
Doc: Fixed the example of an encoded URL in the class description.
Added an additional check to workaround an issue on Windows.
|
| |\ \ \ \ \
| | | |_|_|/
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (60 commits)
Fix assert error on Windows with a negative char.
Revert readonly BorderImage::sourceSize change
URLs used with scheme handler use appropriate encoding for scheme
Fix memory leak in ListModel custom parser
DEF file update
If automatic translation of input widget is off, skip reset
Prevent leakage of native window handles
QSslCertificate: blacklist fraudulent *.google.com
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()
...
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Denis Dzyubenko
Fixes: QTBUG-20228
|
| | |\ \ \ \ |
|
| |\ \ \ \ \ \
| | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (132 commits)
Fix delayed password masking mid-string.
Disabled splitscreen translation still moves screen
don't crash when destroying codec list
Join user state of removed text blocks
Adding Persian translation of Qt.
Missed break of switch-case added
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
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
...
|
| | |\ \ \ \ \ |
|
| | |\ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: David Boddie
Original-patch-by: Friedemann Kleint
(cherry picked from commit 8b1654ec6a892e84c1654c9196e80461ee6e92fa)
|
| | |/ / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-20398
|
|\ \ \ \ \ \ \ \
| | |_|_|_|/ / /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QSslCertificate: block all DigiNotar (intermediate and root) certs
QSslCertificate: also check common name for blacklisted certificates
Fix typo in header guard.
fix doc typo
Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdk
remove obsolete define
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
and do not only check leaf certificates, but all intermediates and
the root. Tested manually with the cross-signed intermediates.
Reviewed-by: Richard J. Moore <rich@kde.org>
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
... 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>
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-21210
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
When the 10.7 SDK was specified explicitly then it would fail the check
inside the pro file. So this ensures that this is accounted for.
Task-number: QTBUG-20516
Merge-request: 2657
Reviewed-by: ossi
|
| | |_|_|_|/ /
| |/| | | | | |
|
|\ \ \ \ \ \ \
| |_|_|_|_|/ /
|/| | | | | /
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Dragging in nested views no longer works as expected
Fix implicit height not growing when pre-edit text wraps.
Fix leak in State element.
Fix leak in bindings created by PropertyChanges.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The detection of a replay event doesn't work if the release event is
not handled due to a parent grabbing the mouse. Use the
spontaneous() flag to determine if we are dealing with a replay
event.
Change-Id: I36e39e6ad8e426bd5f5f2a013aa236aac34ba5cc
Task-number: QTBUG-21219
Reviewed-by: Michael Brasser
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QTextDocument::isEmpty() doesn't account for pre-edit text so use the
return value of size() to determine if implicitHeight should fall back
to the font height instead.
Change-Id: I028552a7646372b22894c45946a57ec4951b044a
Task-number: QTBUG-21288
Reviewed-by: Martin Jones
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
If a state was destroyed while active, it would leak bindings.
Task-number: QTBUG-21194
Reviewed-by: Aaron Kennedy
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I1c7b575e1ace2b879dba130cd31e3ff8cf67260a
Task-number: QTBUG-17770
Reviewed-by: Aaron Kennedy
|
|\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
|\ \ \ \ \ \ \
| | |/ / / / /
| |/| | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
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
|
|\ \ \ \ \ \ \
| |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
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
|
|\ \ \ \ \ \ \
| | |/ / / / /
| |/| / / / /
| |_|/ / / /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: TrustMe
|
| |\ \ \ \ \
| |/ / / / /
|/| | | | |
| | | | | |
| | | | | | |
Conflicts:
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
|
|\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
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>
|
|\ \ \ \ \ \ \
| |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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)
...
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|