summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update changes for 4.7.3v4.7.3Timo Turunen2011-03-301-0/+12
| | | | | Reviewed-by: Trust Me (cherry picked from commit 45c4c792c48605de4cbc28637a39bce5a65b1613)
* Show softkeys when opening a dialog that has a fullscreen parent.Miikka Heikkinen2011-03-292-19/+64
| | | | | | | | | Now shows the CBA for each window that defines softkeys even if topmost parent is fullscreen. Task-number: QTBUG-4953 Reviewed-by: Sami Merila (cherry picked from commit 5a6acc0ba1ed3b056f4c7a9c37481f4cb347a352)
* QSslCertificate: report fraudulent certificates as invalidTimo Turunen2011-03-2812-4/+204
| | | | | | | | | | | | | | | There are some fraudulent certificates in the wild that are not valid; this patch introduces a blacklist of serial numbers of those certificates. Reviewed-by: Richard J. Moore Reviewed-by: Markus Goetz Task-number: QTBUG-18338 (cherry picked from commit 04e074e8d7c097295505e63565abdc7ca2b49f7b) Conflicts: tests/auto/qsslcertificate/tst_qsslcertificate.cpp
* QSslCertificate: fix test for blacklisted certs on WindowsTimo Turunen2011-03-281-0/+9
| | | | | | | | | | | | | Apparently the wildcard matching and the SRCDIR hack don't go well together. Reviewed-by: Markus Goetz Task-number: QTBUG-18338 (cherry picked from commit aeabe790203e7dcb1786e0dad7b4608f1e45b7d5) Conflicts: tests/auto/qsslcertificate/tst_qsslcertificate.cpp
* QSslSocket internals: abort on encountering blacklisted certificatesPeter Hartmann2011-03-281-0/+7
| | | | | | | | | tested manually with "openssl s_server -cert blacklisted.pem -key key.pem" and connecting a QSslSocket. Reviewed-by: Markus Goetz Task-number: QTBUG-18338 (cherry picked from commit b87528a71b66e786c11804d7b79e408aae612748)
* QSslSocket: add test for blacklisted certificatesPeter Hartmann2011-03-283-3/+74
| | | | | | Reviewed-by: Richard J. Moore Task-number: QTBUG-18338 (cherry picked from commit 764e060a389a18a5804d23c528abdaebcee3ca13)
* Changes for 4.7.3Timo Turunen2011-03-231-0/+47
| | | | | Reviewed-by: Trust Me (cherry picked from commit 5054d7ecdb3bd3fc1c5bf77a99b1675c26ba9795)
* Fix for wrong dpi metrics for raster pixmaps on Symbian.Laszlo Agocs2011-03-171-18/+11
| | | | | | | | | | | | | The original implementation relied on SizeInTwips() for the underlying bitmap which unfortunately returns 0, leading to incorrect results from QPixmap::logicalDpiX/Y(). This caused issues in text rendering onto pixmaps (QTBUG-17628). This fix changes QS60PixmapData to use a slightly different metrics() implementation (the one VG and GL PixmapData are using). Task-number: QTBUG-18154 Reviewed-by: Jani Hautakangas (cherry picked from commit 48629ab39aa4e20b21a359dc251569a98606983d)
* Fix qgraphicstransform autotest for Symbian, where qreal is float.Laszlo Agocs2011-03-161-2/+12
| | | | | | | Task-number: QTBUG-17907 Reviewed-by: Samuel Rødal (cherry picked from commit 99aa67f649c44dda8c0da639b4925dbb0e4c9b70)
* QS60Style: QTreeView::indexRowSizeHint returns incorrect valueSami Merila2011-03-161-2/+5
| | | | | | | | | | | | | | Fix for http://bugreports.qt.nokia.com/browse/QTBUG-17786. QS60Style tries to work around the hardcoded margin that the QCommonStyle adds to menu items (line 4782 in my QCommonStyle.cpp). Unfortunately regular itemview items are handled in the same code branch in QS60Style, so the class incorrectly reduces the itemview height 8 pixels. The reduction should only happen with menu items. Task-number: QTBUG-17786 Reviewed-by: Laszlo Agocs (cherry picked from commit 8b7c98123eadf9263c6bde4b1263bd64fc388c8d)
* QDeclarativeDebug: Export needed symbols on SymbianTimo Turunen2011-03-143-47/+47
| | | | | | | | | | | | | | Allow applications to link against the QDeclarativeDebugService API. This is needed for on-device debugging of QML. (The removal of the symbols was a regression in 4.7.2). Task-number: QTBUG-17503 Reviewed-by: Tom Sutcliffe (cherry picked from commit fbf73dec65df9c27a3a09ca9b436f5f8cb9f1b0e) Conflicts: src/s60installs/bwins/QtDeclarativeu.def
* Bump Qt version to 4.7.3Timo Turunen2011-03-1120-38/+38
| | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit e90cff53cdd7bf0bdfed1f2e8efb90539c6f33ba) Conflicts: tools/qdoc3/test/qt-project.qdocconf
* Fix QTBUG-17627: build break in mobility bearer applicationsCristiano di Flora2011-03-111-3/+2
| | | | | Task-Number: QTBUG-17627 (cherry picked from commit f86e014bb6f2754bfed33106021a809ca8c2ce73)
* Fix for major regression in OpenVG clippingJani Hautakangas2011-03-111-0/+1
| | | | | | | | | | OpenVG paint engine didn't reset it's mask fallback state correctly when engine was resetted. Task-number: QTBUG-17966 Reviewed-by: Jason Barron (cherry picked from commit 2ecb0ea77c04424f6f557ca8a13c1d86666763df)
* Unsuccessful unlocking of QNetworkConfigurationPrivate mutexPerttu Pohjonen2011-03-101-0/+1
| | | | | | | | Above mentioned mutex is locked twice: first in caller function and second time in called function. Called function unlocks mutex and emits signal clearly unaware that the mutex is actually still locked. I changed the mutex to be unlocked before the function is called. Task-number: QTBUG-15108 Reviewed-by: Ville Pernu (cherry picked from commit c15560fbe2a1762117395c5ecaaecfa5ab8dce6f)
* Fix typo in qglthreads auto test.v4.7.2Jani Hautakangas2011-02-211-1/+1
| | | | | Reviewed-by: TRUSTME (cherry picked from commit 97503dfd7fad9c8023b2f9632e6ef865ccd0cad8)
* Add selected P1 tasks to changes file.Jason McDonald2011-02-211-133/+140
| | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit 11f11f8ad562472759df24a410d52edd63eb2cf4) Conflicts: dist/changes-4.7.2
* My 4.7.2 changesJason McDonald2011-02-211-4/+80
| | | | | | | | (cherry picked from commit ab38731fe5dcfaa1a7a70bc290a8856b5b01524d) Conflicts: dist/changes-4.7.2
* 4.7.2 changesIain2011-02-211-0/+16
| | | | | Reviewed-by: TrustMe (cherry picked from commit 97305f4ca91b380f42ff5d3fd49c268df0c5ff8c)
* Changes for 4.7.2Gareth Stockwell2011-02-211-4/+10
| | | | | Reviewed-by: Jani Hautakangas (cherry picked from commit 36f8782a5994d5ea2cd71695daf0f33b5e37e609)
* Implementation of QNetworkProxyFactory::systemProxyForQuery() for SymbianJeremy Katz2011-02-211-0/+4
| | | | | | | | | This implementation replaces the default do-nothing version, querying the device's commsdat for appropriate entries. Task-number: QTBUG-13857 Reviewed by: Jeremy Katz et al. (cherry picked from commit 1b6656ea26d2a82a8763e8f3759b0ac683fca57a)
* Prevents crashing when ICO file has bad color table valueMauri Vehniäinen2011-02-181-0/+2
| | | | | | | | | | | | When color table value is read from ICO header memory allocation is made based on this value. This case is relevant only when reading 8bit images. Therefore values over 256 will abort reading the image. Task-number: QT-4535 Merge-request: 1090 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com> (cherry picked from commit d6c1e5d78bdfbeb373970b65d8260f7e9f9ce1bd)
* Attempt to fix symbian 3.1 and 3.2 compile break.Jason McDonald2011-02-181-3/+7
| | | | | | | | | | | | | | | e46c44f9538dbe5b44ce61d3a42403cfa471ae8b restructured qml.pri. In the original version the else part at the bottom of the file was processed for Symbian 3.1 and 3.2, but the commit stopped that from happening. This commit makes the minimal change to make the statements in the else part apply to 3.1 and 3.2 again. Really the file should be restructured to have separate logic for setting each vairable, but I'll leave that task for the developers. Reviewed-by: Eckhart Koppen (cherry picked from commit c658394f1b34c98b141eff22a69a3f4c7bbd4c51)
* Changed the localized vendor name for Qt SIS packages to "Nokia"Eckhart Koppen2011-02-183-3/+3
| | | | | | | | | The previously used name "Nokia, Qt" was not usable for Nokia Content Signing, which only allows "Nokia" as the visible vendor name. The unique vendor ID remains as "Nokia, Qt" Reviewed-by: TrustMe (cherry picked from commit a8a84f1667966acfa093c4be0b7d4b0900ddd3d9)
* Remove sqlite3.sis from qt.sis.Miikka Heikkinen2011-02-173-27/+20
| | | | | | | | | | Nokia Content Signing doesn't like embedded sis packages, so remove the embedded sqlite3.sis from qt.sis. It must now be installed separately just like Open C packages. Task-number: QTBUG-17399 Reviewed-by: axis (cherry picked from commit 924bcf1ccd9d25484fda8b8d68b8de7744a4693e)
* Remove sqlite3_selfsigned.sis as it is no longer usable or needed.Miikka Heikkinen2011-02-172-2/+1
| | | | | | | | | | | | | Selfsigned qt.sis no longer installs on top of sqlite3_selfsigned.sis as patching embedded sises and dependencies was removed from patch_capabilities.pl script. However, since the regular sqlite3.sis is nowadays signed for all three Symbian manufacturers that Qt supports, there is no more need to have a self-signed sqlite3.sis in the first place, so it is removed to reduce confusion. Task-number: QTBUG-16576 Reviewed-by: axis (cherry picked from commit 99f500838e4eaba9d99c3ea2cd6b4fc5efe0b8b4)
* Revert "Fix compilation error."Jason McDonald2011-02-171-2/+0
| | | | | | | Postponing this fix to 4.7.3 as it triggers an internal error in MonGW's gcc, which breaks the MinGW binary package. This reverts commit 68979c65de998bae97c2104eaa09b7ad72821b9e.
* Introduce new flag for splitview support in SymbianSami Merila2011-02-172-0/+8
| | | | | | | | | Introduce new flag for splitview support as internal to Qt 4.7.2. The actual implementation will be delivered to Qt 4.7.3. Task-number: QTBUG-16572 Reviewed-by: Janne Koskinen (cherry picked from commit 899094da212e5bb1c3b9bce03b6c91d60cbdd13f)
* Bump QtWebKit version to 2.0.2Ademar de Souza Reis Jr2011-02-171-2/+2
| | | | | | | | | | QtWebKit 2.0.1 was part of Qt-4.7.1, QtWebKit as included in 4.7.2 should be 2.0.2. Merge-request: 1095 Task-number: QTBUG-17480 Reviewed-by: Jason McDonald (cherry picked from commit dfde84cccb14b109bebd672108a0ce0d6131361f)
* Update .def files for 4.7.2.Jason McDonald2011-02-172-43/+87
|
* Change to release license header.Jason McDonald2011-02-167890-98056/+98056
| | | | Reviewed-by: Trust Me
* Fix for clipping failure in OpenVG paint engine.Jani Hautakangas2011-02-162-5/+33
| | | | | | | | | | | OpenVG implementation for Broadcom chip has limited scissor rect count to 32. Because of that Qt OpenVG paint engine fails to clip correctly if clip rect count exceeds 32. This patch makes Qt OpenVG paint engine to use mask instead of scissors in such cases. Task-number: QTBUG-16932 Reviewed-by: Jason Barron (cherry picked from commit 0a84c39a92c4d4d7f2a5e19e949116df24219aa1)
* Don't leak ScopeChainNode'sJason McDonald2011-02-161-3/+1
| | | | | | | | | | | | | | | | | | | | | Create a sub-scope of the global scope chain, rather than a completely new scope chain. Leaks are difficult to autotest, but an autotest for QScriptDeclarativeClass::pushCleanContext() was added to ensure its behavior doesn't regress. To reproduce the leak (prior to this change) use: while (true) { QScriptDeclarativeClass::pushCleanContext(&engine); engine.popContext(); } Change-Id: I41ac61ea1664da569eb329c8276f2a0bb6d2f1f7 Task-number: QTBUG-17166 Reviewed-by: Martin Jones (cherry picked from commit 3bc6f8d8dd630cd0298e27fc4b7430d2bf73a232) Conflicts: tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
* Fix for ARMV6 drawhelper blendingJani Hautakangas2011-02-151-2/+2
| | | | | | | | | Asm code used wrong source register when doing constant alpha blending. Task-number: QTBUG-16008 Reviewed-by: TRUSTME (cherry picked from commit 04ddaa986504e3842920770927cb7247e5e0fb78)
* Worked around a SC issue in S60 3.x vs 5.0 versions.axis2011-02-151-1/+13
| | | | | | Task: QTBUG-16578 RevBy: Gareth Stockwell (cherry picked from commit 984bc6626c4f290572ac721fd10edda99691306f)
* Rename 'plugins\qmldebugging' (work around qmake issues)Kai Koehne2011-02-147-6/+6
| | | | | | | | | | On Windows, qmake places the tcpserver.dll in a 'plugins\qmlreleaseging' folder, which broke remote debugging of QtDeclarative completely. New name 'qmltooling' while being not so specific, avoids the use of 'debug' in the folder name. Task-number: QTBUG-17360 Reviewed-by: Martin Jones (cherry picked from commit 2855782a45b08aedbed960125514fdd9663ff1c8)
* QDeclarativeDebug: Remove unused fileKai Koehne2011-02-142-1/+0
| | | | | Got added in 5336e1838a95d97. (cherry picked from commit 111e306c9991a0d89b0001b476e466891974945f)
* QDeclarativeDebug: Move Tcp server to separate pluginKai Koehne2011-02-1410-68/+136
| | | | | Reviewed-by: Christiaan Janssen (cherry picked from commit 21016c3b28674029a2a205da38f54e362e3635b9)
* QDeclarativeDebug: Move networking code out of QDeclarativeDebugServerKai Koehne2011-02-149-95/+383
| | | | | | | | Move socket handling code out of QDeclarativeDebugServer into a QDeclarativeDebugServer(Tcp)Connection class. Reviewed-by: Christiaan Janssen (cherry picked from commit 5336e1838a95d97d34863b668ff797582c226e79)
* QDeclarativeDebug: Decouple QDDServer, QDDService classesKai Koehne2011-02-145-311/+541
| | | | | | Move QDeclarativeDebugServer class into it's own files and make the classes less interdependent. (cherry picked from commit 5d251ef253065d68967ae3263b3cf7f1d93d7a00)
* Fix declarative autotest compilation on SymbianJoona Petrell2011-02-145-12/+27
| | | | | | Task-number: Reviewed-by: Martin Jones (cherry picked from commit e46c44f9538dbe5b44ce61d3a42403cfa471ae8b)
* QDeclarativeDebug: Include debugger plugin in qmlviewer.sisKai Koehne2011-02-141-0/+5
| | | | | | | | Developers that want to debug qml on their device have to now install qmlviewer.sis. Reviewed-by: Christiaan Janssen (cherry picked from commit 35ae0b8146bca7a61203ee347654aed27951439c)
* Make addImportPath() work for windows paths starting with lower caseBea Lam2011-02-142-3/+15
| | | | | | | | | | | | | Was causing assert failure on windows if the 'c:' was lower case, since it was being added to the import path database with a lower case and thus later lookups with an upper case 'c:' would fail. This change fixes the check for whether the path refers to a local path or not. Task-number: QTBUG-16885 Change-Id: I0a2a2f705443ed453fb2b13f8599e035c2bd2877 Reviewed-by: Martin Jones (cherry picked from commit 33512bc223be373975426ffcc6f8fa783a7582c9)
* Update modules-related tests and docsBea Lam2011-02-148-73/+210
| | | | | | | | Added tests for remote imports and fixed/improved examples and text in the docs. Change-Id: I8f411a0287c4d50ec3cebe5567d803689cd5b1c7 (cherry picked from commit d7e42d7c5b0eb6513526d0c21025939a467e8d68)
* Add test for importing plugins that contain QML filesJason McDonald2011-02-147-1/+91
| | | | | | | | (cherry picked from commit a78f6b1718b8285cb65ae989a070bf8703746b5d) Conflicts: tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro
* Fix QFileDialog Symbian native file dialog filename filtering.Miikka Heikkinen2011-02-141-33/+19
| | | | | | | | | | Now QFileDialog static functions that use Symbian native file dialog should find the same files as non-native QFileDialog for any given filename filter. Task-number: QTBUG-17298 Reviewed-by: Janne Koskinen (cherry picked from commit 5ec67c969dce335a26c402b73bb19a6751401871)
* Don't crash when BMP color table is brokenHarald Fernengel2011-02-111-0/+2
| | | | | | | | | | | If the BMP's number of color table entries is out of bounds, we would resize our color table vector to a silly value, leading to crashes later on. If the number of color table entries is larger than 256, just stop processing the BMP since it's most probably corrupt. Task-number: QT-4534 Reviewed-by: Robert Griebl (cherry picked from commit de1cfc13c66fcb35d0a211bb5136ebc25279041a)
* Change paging attributes for Symbian binariesIain2011-02-113-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed UNPAGED workaround from QtCore and QtSql on OS releases where data paging is supported. Depends on new macro being defined in the OS builds (SYMBIAN_DLL_DATA_EXPORTS_SUPPORTED) to allow us to detect this. Data exports are supported in all S^3 builds after early 2009, however, this macro is only added recently (and thus isn't defined in, eg. Symbian Foundation PDKs (v3.0.4), or current releases (v0.9) of the S^3 SDK from Nokia). Thus building Qt against these older S^3 builds will still result in QtCore and QtSql being unpaged. Also, remove PAGED keyword from all Qt-based software. This changes the code paging field in the Symbian (E32Image) header from "paged" to "default". Thus it is left to the configuration of the particular device whether paging is used for the binary or not. All devices that support code paging should have it turned on (the value is stored in the HAL, so can be checked using eg. fshell); data paging may or may not be turned on depending on the device characteristics. Leaving both code and data paging as "default" means that any limitations in the device (eg. around flash wear) can be controlled by that device by disabling the appropriate types of paging. This change also leaves the way open to deprecated PAGED as a keyword in the Symbian build systems, so you can only opt out of paging. This makes more sense, as the default for code paging will be on, the default for data paging will be on if the device can handle it, and binaries should only be opting out of paging if they have some specific real-time requirements that paging inhibits. Task-number: QT-3503 Task-number: QTBUG-13931 Reviewed-by: Shane Kearns (cherry picked from commit 34aca9f03e25e94b4ca730ddd3c88aa95653a0b5)
* rebuild configure in 4.7.2Oswald Buddenhagen2011-02-111-0/+0
|
* Don't ignore source-text when generating qsTrId translations for QMLTor Arne Vestbø2011-02-103-1/+9
| | | | | Reviewed-by: ossi (cherry picked from commit bb84c5ef4f620af659395b66e6ed792a380b9a1f)
generated by cgit v0.12 at 2025-03-21 00:42:58 (GMT)