summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Adding quote around files in QMAKE_CLEAN to tackle wildcard issueGuoqing Zhang2011-03-092-2/+5
| | | | | Task-number: QTPROD-875 Reviewed-by: Miikka Heikkinen
* Added native image handle provider header.Laszlo Agocs2011-03-082-1/+70
| | | | | Task-number: QT-4632 Reviewed-by: Jani Hautakangas
* Added native image handle provider support in pixmaps on openvg.Laszlo Agocs2011-03-0810-6/+345
| | | | | | | | | | | | | | | QNativeImageHandleProvider is a thin interface consisting of get() and release() functions. Pixmaps constructed with such a provider will call these functions to acquire and release a native handle, e.g. a CFbsBitmap or RSgImage pointer in case of Symbian. The behavior is largely similar to constructing pixmaps via fromSymbianCFbsBitmap or fromSymbianRSgImage, with the exception of pixmap hibernation: release() (and subsequently get()) is guaranteed to be called also in case of hibernation, allowing more fine-grained tracking of the usage and lifetime of image data. Task-number: QT-4632 Reviewed-by: Jani Hautakangas
* Correcting incorrect ordinal introduced by the split view changes.Laszlo Agocs2011-03-081-1/+1
| | | | Reviewed-by: TRUSTME
* Support partial input modeSami Merila2011-03-086-9/+345
| | | | | | | | | | | | | | | | | | | | | | | | By default Symbian devices use fullscreen editing mode. However, in the latest AVKON releases a partial virtual keyboard is supported. Support the non-fullscreen editing mode from QCoeFepInputContext. The non-fullscreen editing mode is only supported for Symbian^3 and only for graphicsview-based solutions (QGraphicsView, QGraphicsWebView, QDeclarativeView, ...). When native side indicates that the keyboard opens, the graphicsview is possibly translated so that the text cursor position is ensured to be visible. When keyboard closes, the translation is removed. If the graphicsview contains vertical scrollbar, the whole view is resized to the area above the keyboard, since translating it, would move the upper part of the scrollbar out of screen area. There is a new exported private API to control when partial vkb is used. Task-number: QTBUG-16572 Reviewed-by: axis Reviewed-by: Mrudul Pendharkar Reviewed-by: Laszlo Agocs
* Avoid compiler warnings in openvg on win32.Laszlo Agocs2011-03-072-1/+6
| | | | Reviewed-by: TRUSTME
* Updated def files with new QVGPixmapData function.Laszlo Agocs2011-03-072-0/+2
| | | | Reviewed-by: TRUSTME
* VGImage readback support in QPixmap on OpenVG.Laszlo Agocs2011-03-075-12/+148
| | | | | | | | | | | Enable readback of pixel data for pixmaps that are constructed directly from a VGImage. These do not have any backing data in main memory (i.e. 'source' is null), however certain operations, like toImage(), fill(), or painting into the pixmap do not work without it. With this patch the data is read back via vgGetImageSubData when needed. Task-number: QT-4669 Reviewed-by: Jani Hautakangas
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-071-2/+9
|\ | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: PinchArea example produced incorrect scaling.
| * PinchArea example produced incorrect scaling.Martin Jones2011-03-071-2/+9
| | | | | | | | | | | | | | | | | | The maths was dodgy - producing far greater scaling than that provided by PinchArea. Change-Id: I4a1ee1b0d65eed623ec9ee92c22c9740116430c5 Task-number: QTBUG-17828 Reviewed-by: Michael Brasser
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-044-2/+10
|\ \ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Added image conversion flag to prevent conversions.
| * | Added image conversion flag to prevent conversions.Samuel Rødal2011-03-044-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | This is needed in the meego graphics system to support the shared image fallback path (when using the raster graphicssystem). The flag is internal. Reviewed-by: Gunnar Sletta
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-046-23/+151
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix TextInput auto test failure on mac. Fix word selection locking on string boundaries. Fix potential crash in QTextControl. QDeclarativePropertyMap::keys() cannot be called from qml Compensate for horizontal scroll in TextInput micro focus.
| * | Fix TextInput auto test failure on mac.Andrew den Exter2011-03-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Disable auto scroll so the relative position of the text isn't changed when inserting text and changing the cursor position. Change-Id: I6a18e91e98014f1e94216bc85241ebb0d604dd84 Reviewed-by: Bea Lam
| * | Fix word selection locking on string boundaries.Andrew den Exter2011-03-042-12/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTextBoundaryFinder will return the position -1 if it reaches the end of a string without finding a boundary, reset the cursor and anchor to 0 or the string length as appropriate in those cases. Also allow selection to lock onto the string limits as if they were words. Change-Id: Ie9d233967c73eb6a61f19c76494f04bca18612f8 Task-number: QTBUG-17860 Reviewed-by: Martin Jones
| * | Fix potential crash in QTextControl.Lasse Holmstedt2011-03-041-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | inputContext() is only safe to call if there is a current contextWidget. Change-Id: I6cbccf5f5fbb2d8c9ca6acf5f7e02f680eb84483 Reviewed-by: Andrew den Exter
| * | QDeclarativePropertyMap::keys() cannot be called from qmlCharles Yin2011-03-033-8/+55
| | | | | | | | | | | | | | | | | | | | | | | | Not allow create dynamic properties which are same with existing method (method, signal, slot) names. Change-Id: I0ae64c8a6a89ef4f7614169088f7c005edad40b0 Task-number:QTBUG-17868 Reviewed-by:Martin Jones
| * | Compensate for horizontal scroll in TextInput micro focus.Andrew den Exter2011-03-032-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Return the adjusted cursore rectangle rather than the one returned by QLineControl. Change-Id: I343ecdb47ef2ea59519c8d155bbb9917d9c8ce56 Task-number: QTBUG-17864 Reviewed-by: Martin Jones
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-031-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Use the generic QVoltileImage implementation on S60 3.1 and 3.2.
| * | | Use the generic QVoltileImage implementation on S60 3.1 and 3.2.Laszlo Agocs2011-03-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | BeginDataAccess() and EndDataAccess() is only available from S60 5.0 and QVolatileImage is not used on such platforms anyway. Reviewed-by: Jani Hautakangas
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-032-4/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (119 commits) fix DLLDESTDIR handling in nmake generator when QMAKE_POST_LINK is used un-document semicolon-splitting of INCLUDEPATH Fix typo in qglthreads auto test. Add selected P1 tasks to changes file. My 4.7.2 changes (cherry picked from commit ab38731fe5dcfaa1a7a70bc290a8856b5b01524d) 4.7.2 changes Changes for 4.7.2 Implementation of QNetworkProxyFactory::systemProxyForQuery() for Symbian Prevents crashing when ICO file has bad color table value Attempt to fix symbian 3.1 and 3.2 compile break. Changed the localized vendor name for Qt SIS packages to "Nokia" Remove sqlite3.sis from qt.sis. Remove sqlite3_selfsigned.sis as it is no longer usable or needed. Revert "Fix compilation error." Introduce new flag for splitview support in Symbian Bump QtWebKit version to 2.0.2 Update .def files for 4.7.2. Change to release license header. Fix for clipping failure in OpenVG paint engine. Don't leak ScopeChainNode's ...
| * \ \ \ Merge commit 'v4.7.2' into 4.7Toby Tomkins2011-03-020-0/+0
| |\ \ \ \
| | * | | | 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)
generated by cgit v0.12 at 2024-11-15 15:27:30 (GMT)