summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-122-5/+8
|\ | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: StrictlyEnforceRange with snapOneItem/Row and header behavior change
| * StrictlyEnforceRange with snapOneItem/Row and header behavior changeMartin Jones2011-09-122-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-09-093-5/+12
|\ \ | | | | | | | | | | | | | | | | | | 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
| * | Release font engine refcount when done using it in QTextEngineJiang Jiang2011-09-093-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-09-081-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | update the proxy info before session is opened in QNAM by Aapo MakelaKranthi Kuntala2011-09-081-0/+5
| | | | | | | | | | | | | | | | Reviewed-By: Kranthi Kuntala <kranthi.kumar-kuntala@nokia.com>
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-09-071-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * \ \ \ Merge remote-tracking branch 'mainline/4.7' into 4.7Casper van Donderen2011-09-0230-113/+320
| |\ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-08-17259-54226/+28871
| |\ \ \ \ \
| * | | | | | Doc: Fixed the example of an encoded URL in the class description.David Boddie2011-07-211-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20398
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-09-075-21/+48
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | QSslCertificate: block all DigiNotar (intermediate and root) certsPeter Hartmann2011-09-062-8/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | | QSslCertificate: also check common name for blacklisted certificatesPeter Hartmann2011-09-061-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... 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>
| * | | | | | Fix typo in header guard.Jason McDonald2011-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-21210
| * | | | | | fix doc typoOswald Buddenhagen2011-09-051-1/+1
| | | | | | |
| * | | | | | Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdkOswald Buddenhagen2011-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | remove obsolete defineOswald Buddenhagen2011-09-051-1/+0
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-074-2/+18
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | * '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.
| * | | | Dragging in nested views no longer works as expectedMartin Jones2011-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Fix implicit height not growing when pre-edit text wraps.Andrew den Exter2011-09-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Fix leak in State element.Michael Brasser2011-09-021-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a state was destroyed while active, it would leak bindings. Task-number: QTBUG-21194 Reviewed-by: Aaron Kennedy
| * | | | Fix leak in bindings created by PropertyChanges.Michael Brasser2011-09-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1c7b575e1ace2b879dba130cd31e3ff8cf67260a Task-number: QTBUG-17770 Reviewed-by: Aaron Kennedy
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-09-021-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 used with scheme handler use appropriate encoding for schememread2011-09-011-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-022-4/+8
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Revert readonly BorderImage::sourceSize change
| * | | | Revert readonly BorderImage::sourceSize changeMartin Jones2011-09-012-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Fix memory leak in ListModel custom parserBea Lam2011-09-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | DEF file updateGareth Stockwell2011-08-312-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
* | | | | Merge branch 'qt-4.7' into 4.7Liang Qi2011-08-3127-64/+155
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: src/gui/inputmethod/qcoefepinputcontext_s60.cpp
| * | | | QSslCertificate: blacklist fraudulent *.google.comPeter Hartmann2011-08-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | Symbian: Not possible to catch RequestSoftwareInputPanel in eventFilterSami Merila2011-08-301-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Exact word bubble doesn't disappear when screen is tapped (fix part 2)Sami Merila2011-08-302-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Exact word bubble doesn't disappear when screen is tappedSami Merila2011-08-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Compile fix for Symbian 5th and earlierSami Merila2011-08-301-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Symbian: Fix backspace on empty lines of multiline texteditsMiikka Heikkinen2011-08-301-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Handle CloseSoftwareInputPanel event in QCoeFepInputContextSami Merila2011-08-301-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Fix delayed password masking mid-string.Andrew den Exter2011-08-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Disabled splitscreen translation still moves screenSami Merila2011-08-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Make text rendering working outside the gui thread on Symbian.Laszlo Agocs2011-08-303-11/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Fix softkeys cleanupMiikka Heikkinen2011-08-301-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Fix clientRect usage in QWidgetPrivate::setGeometry_sys()Miikka Heikkinen2011-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Do not allow fullscreen/maximized windows to expand beyond client rectMiikka Heikkinen2011-08-301-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Do not modify window size for fullscreen windows in setGeometry_sysMiikka Heikkinen2011-08-301-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Revert accidental commitBea Lam2011-08-301-205/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Rework threading internals in XmlListModel to avoid global staticBea Lam2011-08-301-91/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Fix undesirable VKB popup at task switchMiikka Heikkinen2011-08-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Doc: Clarified the range of return values from QLineF::angle().David Boddie2011-08-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20197 (cherry picked from commit 86608d537eabc3cf7e1d1ddd1d0a2f90ccc2de2a) Reapplied after bad v4.7.4 merge
| * | | | Doc: Fixed \since declarations.David Boddie2011-08-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 358e018dbb4b4dbdbfc702a6d462f113a1357e1e) Reapplied after bad v4.7.4 merge
| * | | | Doc: Standardized on QtQuick for \since declarations.David Boddie2011-08-3013-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 609dc22f719ecb8d48349fd56f84960bbf46d731) Reapplied after bad v4.7.4 merge
| * | | | Doc: Added more appropriate links to help reduce confusion.David Boddie2011-08-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-19919 (cherry picked from commit 26c29a2dd7efa4c66063d1255e1f694462cbae85) Reapplied after bad v4.7.4 merge
generated by cgit v0.12 at 2025-01-10 03:21:54 (GMT)