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-02-1814-110/+183
|\ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix TextEdit auto test failure on windows. Fix FocusScope example. Fix compilation on old Symbian platforms Export symbols from qtestlib required for QtQuickTest Allow MouseArea to prevent mouse grab begin stolen by Flickable. Fix QTBUG-17008 XmlListModel blocks Windows system events Fix TextInput, TextEdit auto test failure on windows and mac. QDeclarativeDebug: Fix crash when serializing list of QObjects Update the input context when the pre-edit cursor position changes.
| * Export symbols from qtestlib required for QtQuickTestRhys Weatherley2011-02-175-9/+43
| | | | | | | | | | Task-number: QTBUG-16084 Reviewed-by: Jason McDonald
| * Allow MouseArea to prevent mouse grab begin stolen by Flickable.Martin Jones2011-02-174-3/+44
| | | | | | | | | | | | | | | | | | | | | | | | Placing a MouseArea in a Flickable (or PinchArea, or PathView) allows the Flickable to steal mouse events when it detects a flick/drag event. In some cases this is not desireable and MouseArea should be able to retain its grab. Added a 'preventStealing' property to prevent an ancestor item from stealing the MouseArea's grab. Change-Id: I6277fbb76919b2b35d4e32a247b38a90e305dbdf Task-number: QTBUG-17285 Reviewed-by: Joona Petrell
| * Fix QTBUG-17008 XmlListModel blocks Windows system eventsCharles Yin2011-02-171-90/+80
| | | | | | | | | | | | | | | | | | | | | | XmlListModel uses a worker thread to process XML query, however the worker thread doesn't use it's own event loop. So after processing the query, the worker thread just blocks on a wait condition and then blocks all posted system events. Change-Id: Icdd9ddd1f3f26fd632726f7200c2a81b0877d2d1 Task-number:QTBUG-17008 Reviewed-by:Martin Jones
| * QDeclarativeDebug: Fix crash when serializing list of QObjectsKai Koehne2011-02-161-8/+10
| | | | | | | | | | Task-number: QTBUG-17444 Reviewed-by: Aaron Kennedy
| * Update the input context when the pre-edit cursor position changes.Andrew den Exter2011-02-163-0/+6
| | | | | | | | | | | | | | | | | | | | The micro focus rect changes both when the regular cursor position and the pre-edit cursor positions change. Ensure updateMicroFocus is called TextInput in both cases. Change-Id: I6822a710b841e106ce2462f74fea398250596913 Task-number: QTBUG-17396 Reviewed-by: Martin Jones
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-02-183-4/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Added test case for corrupt pixel count in XPM image. QImage crash when invalid XPM is read. Fix an issue with removing rows in a table model.
| * | QImage crash when invalid XPM is read.Niklas Kurkisuo2011-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sanity check for cpp, which would otherwise lead to a segfault later in the code. Task-number: QTBUG-17254 Merge-request: 1080 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | Fix an issue with removing rows in a table model.Michael Goddard2011-02-182-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tables with nulls in a row were not being deleted properly in some cases. Made sure the responsible function no longer has default parameters so this doesn't happen again. Change-Id: I479121172d5ac172ca49da78638b9353d7a67548 Task-number: QTBUG-16007, QTBUG-15979 Reviewed-by: Charles Yin
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-183-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Changed the localized vendor name for Qt SIS packages to "Nokia"
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Eckhart Koppen2011-02-171-17/+0
| |\ \ \
| * | | | Changed the localized vendor name for Qt SIS packages to "Nokia"Eckhart Koppen2011-02-173-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
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-02-171-95/+52
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: RGBA32 -> RGB565 dithering in Meego Graphicssystem,
| * | | | RGBA32 -> RGB565 dithering in Meego Graphicssystem,Tero Tiittanen2011-02-171-95/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dithering in QMeeGoPixmapData::imageToEGLSharedImage is now done using Ordered Dithering, not anymore Floyd-Steinberg dithering. This provides better overall results. Fixes: NB#208927 - X dithering looks better than meego graphicssystem one Merge-request: 1079 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-171-17/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove sqlite3.sis from qt.sis.
| * | | | Remove sqlite3.sis from qt.sis.Miikka Heikkinen2011-02-171-17/+0
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-163-1/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Made Q_ASSERT meaningful again Introduce new flag for splitview support in Symbian
| * | | Made Q_ASSERT meaningful againEckhart Koppen2011-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | m_bytesPadding is an unsigned integer, assert would never have been triggered. Reviewed-by: TrustMe
| * | | Introduce new flag for splitview support in SymbianSami Merila2011-02-162-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
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-152-5/+33
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix for clipping failure in OpenVG paint engine.
| * | | Fix for clipping failure in OpenVG paint engine.Jani Hautakangas2011-02-152-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
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-151-0/+9
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Use QML notation for documenting TextInput::accepted() signal. Document the TextInput accepted() signal.
| * | | Use QML notation for documenting TextInput::accepted() signal.Andrew den Exter2011-02-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the name onAccepted() and refer to it as a handler rather than a signal. Change-Id: Ibd4144aa809e6d9db136187a07e9a660afa5df1b
| * | | Document the TextInput accepted() signal.Andrew den Exter2011-02-151-0/+9
| | | | | | | | | | | | | | | | Change-Id: I30a36ba2724c9641e9cfe5ceafa651728907ef63
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-152-4/+18
|\ \ \ \ | |/ / / | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix inheritance of widget input contexts.
| * | | Fix inheritance of widget input contexts.Andrew den Exter2011-02-152-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a parent widget has an input context assigned return that from QWidget::inputContext() before returning QApplication::inputContext(). Change-Id: I4982a91ace9b7485534f1c31fa4e2d549482640e Task-number: QTBUG-17390 Reviewed-by: axis
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-141-2/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix for ARMV6 drawhelper blending
| * | | Fix for ARMV6 drawhelper blendingJani Hautakangas2011-02-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Asm code used wrong source register when doing constant alpha blending. Task-number: QTBUG-16008 Reviewed-by: TRUSTME
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-02-141-1/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QStyleSheetStyle: dont crash in PE_WIDGET when widget is null
| * | | QStyleSheetStyle: dont crash in PE_WIDGET when widget is nullOlivier Goffart2011-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Gabriel Task-number: QTBUG-15910
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-141-4/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Keep sending posted events after commit 7196045b78b33cf135683d5c0b4e164f95231791
| * | | | Keep sending posted events after commit 7196045b78b33cf135683d5c0b4e164f95231791Bradley T. Hughes2011-02-141-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit put in place a timer based mechanism to ensure that posted events continue to be sent. As pointed out in commit eb1015c7bbf135af3656110a4d112377c1209db8, GetQueueStatus() can indicate that there are messages in the queue but our hook never actually receives them, hence the timer solution. However, having the message type and hwnd "guards" in the conditional for starting a timer would cause us to lose events in some situations, due to the fact that QEventDispatcherWin32::processEvents() will only allow one WM_QT_SENDPOSTEDEVENTS message per call (multiple messages will be compressed into a single one). When racing with other threads, it would be possible to end up blocking one thread that has pending posted events unintentionally. This fix removes the guards and makes sure that we start the keep alive timer when it's really needed, and only stops it when we really know that there is nothing left in the Windows message queue. Task-number: QTBUG-17014 Reviewed-by: joao Reviewed-by: Marius Storm-Olsen
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-141-1/+13
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Worked around a SC issue in S60 3.x vs 5.0 versions. Apply the gcce link rules for LIBS_PRIVATE too. Build Qt with GCCE 4.4.1, Symbian^3 PDK on Linux and Mac OS X.
| * | | | Worked around a SC issue in S60 3.x vs 5.0 versions.axis2011-02-141-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-16578 RevBy: Gareth Stockwell
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-1411-25/+93
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Don't leak ScopeChainNode's Rename 'plugins\qmldebugging' (work around qmake issues) Correct the "module not installed" error handling Flickable uses the flick velocity to determine whether to retain grab Make addImportPath() work for windows paths starting with lower case Report any exceptions occurring in WorkerScript javascript code MouseArea docs - link to onCanceled() from onReleased()
| * | | Don't leak ScopeChainNode'sAaron Kennedy2011-02-141-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
| * | | Rename 'plugins\qmldebugging' (work around qmake issues)Kai Koehne2011-02-116-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Correct the "module not installed" error handlingAaron Kennedy2011-02-111-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The not installed error will be issued if, after loading plugins and considering the contents of qmldir, there are no elements in the particular minor version. For example, if a plugin/qmldir provides the following types (either from C++ or as QML files specified in the qmldir file): Foo 1.1 Bar 1.3 importing versions 1.0, 1.2, or 1.4 will fail with the not installed error. Change-Id: I8566fda6918cb48936144e67a1ce75add0f160d8 Task-number: QTBUG-17324 Reviewed-by: Martin Jones
| * | | Flickable uses the flick velocity to determine whether to retain grabMartin Jones2011-02-111-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flickable keeps the mouse grab if it was recently flicked and another flick is started before it has settled. However, it is using the velocity of the flick rather than the instantaneous velocity of the view, which causes it to be grabbed unless the view has come to a complete stop. Use smoothedVelocity which is updated during the view movement. Also increase the threshold a little. Change-Id: I970318680d38103468155fa566c489c7874d1b00 Task-number: QTBUG-17383 Reviewed-by: Michael Brasser
| * | | Make addImportPath() work for windows paths starting with lower caseBea Lam2011-02-111-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Report any exceptions occurring in WorkerScript javascript codeBea Lam2011-02-111-3/+63
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17183 Change-Id: I709cca0bdce247ca9250c4f334654e2ff57b0b32 Reviewed-by: Aaron Kennedy
| * | | MouseArea docs - link to onCanceled() from onReleased()Bea Lam2011-02-111-0/+2
| | | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-101-33/+19
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix QFileDialog Symbian native file dialog filename filtering.
| * | | Fix QFileDialog Symbian native file dialog filename filtering.Miikka Heikkinen2011-02-101-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
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-105-16/+48
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: PathView items were not correctly updated when rootIndex changed. Allow text to selected in a TextEdit or TextInput inside a Flickable.
| * | | PathView items were not correctly updated when rootIndex changed.Martin Jones2011-02-101-16/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PathView got confused because it queried the model when removing items due to the rootIndex change. This caused new items to be added since the model->count() was not zero (it was the count for the new rootIndex). Calculate the PathView modelCount similarly to the other views (rather than querying the model) and correctly handle the modelCount being set to zero. Change-Id: I9e4fb27c14aa8c77ad37ff01d95c123f909db20d Task-number: QTBUG-16366 Reviewed-by: Bea Lam
| * | | Allow text to selected in a TextEdit or TextInput inside a Flickable.Andrew den Exter2011-02-104-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set keepMouseGrabs to true when the selectByMouse property is enabled to prevent flickable from stealing the mouse grab and interrupting a selection. Change-Id: I08e11265ab9c55d239fd09aceef4fdb8e74aba9d Task-number: QTBUG-16956 Reviewed-by: Martin Jones
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-103-5/+62
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update modules-related tests and docs CLeanup registers after AddString
| * | | Update modules-related tests and docsBea Lam2011-02-102-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tests for remote imports and fixed/improved examples and text in the docs. Change-Id: I8f411a0287c4d50ec3cebe5567d803689cd5b1c7
| * | | CLeanup registers after AddStringAaron Kennedy2011-02-101-3/+38
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Martin Jones Change-Id: I7bd2806770fe5b86fbc589644107d74981d32abe
generated by cgit v0.12 at 2025-01-22 01:20:25 (GMT)