summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-1340-308/+749
|\ | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to dc5821c3df2ef60456d85263160852f5335cf946 Updated WebKit to b4aa5e1ddc41edab895132aba3cc66d9d7129444
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-1240-308/+749
| |\ | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to dc5821c3df2ef60456d85263160852f5335cf946 Updated WebKit to b4aa5e1ddc41edab895132aba3cc66d9d7129444
| | * Updated WebKit to dc5821c3df2ef60456d85263160852f5335cf946Simon Hausmann2010-05-1222-260/+365
| | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/32922> || [Qt] fast/text/find-hidden-text.html || || <https://webkit.org/b/36187> || Rename window.media to window.styleMedia || || <https://webkit.org/b/38286> || Need to call FrameView::scrollPositionChanged when changing the scroll position when the ScrollView does not have a platformWidget || || <https://webkit.org/b/37334> || [Qt] fast/frames/flattening/frameset-flattening-subframesets.html fails intermittently on Qt bot ||
| | * Updated WebKit to b4aa5e1ddc41edab895132aba3cc66d9d7129444Simon Hausmann2010-05-1123-50/+386
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/38747> || mingw-w64 and JIT support || || <https://webkit.org/b/38119> || [Qt] QWebPage viewMode property || || <https://webkit.org/b/37097> || [Qt] Fix infinite redirection loop in QNetworkReplyHandler || || <https://webkit.org/b/38668> || [Qt] Enable YARR_JIT for X86 Mac for QtWebKit || || <https://webkit.org/b/38834> || [Qt] Adapt DNS pre-fetching to Qt DNS cache code || || <https://webkit.org/b/38574> || [Qt] Crash in QGraphicsWebViewPrivate::~QGraphicsWebViewPrivate when animation were used || || <https://webkit.org/b/31407> || [PATCH] [Qt] Compilation with Plugins disabled is broken || || <https://webkit.org/b/38514> || Crash in handleTouchEvent: using dangling node ptrs in hashmap || || <https://webkit.org/b/38646> || Potential crash in EventHandler::handleTouchEvent || || <https://webkit.org/b/38488> || Spatial Navigation: create a getter for the "fudgeFactor" || || <https://webkit.org/b/38523> || [Qt] QtWebKit has render bugs on Google Maps markers || || <https://webkit.org/b/37276> || LayoutTests/fast/canvas/pointInPath.html passed, actually it failed || || <https://webkit.org/b/37023> || [Qt] Expose HTMLTokenizer yielding parameters ||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-1335-340/+650
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (34 commits) Fix TextEdit and TextInput input panel support for mode RSIP_OnMouseClickAndAlreadyFocused Fix for graphics widget in the background stealing declarative item's focus Fix broken benchmarks. Possibly fix autotest Correctly assign bool to variant properties Improve Image docs. Move all fillMode image examples to fillMode Flickable small API changes. Reset the dragDropItem to 0 when the item dies while dragging on top it. Avoid warning (and possible future crash) upon reload. Don't pass sequential (QNetworkReply) to image reader, it doesn't work well enough. Stop GIF handler claiming it can report Size for sequential devices, Use raster graphicssystem for qml.app on OS X. Add missing test, qdeclarativelayoutitem, to declarative.pro Sorted the tests list in declarative.pro Bail out early if the same target value is reassigned to a Behavior. Correctly position any input method popups for TextInput. Correctly resize TextInput in the presence of preedit text. Apply signal handler changes immediately. Remove unused image Qt.widgets was removed, point to graphics layouts example ...
| * | Fix TextEdit and TextInput input panel support for mode ↵Joona Petrell2010-05-134-9/+24
| | | | | | | | | | | | | | | | | | | | | RSIP_OnMouseClickAndAlreadyFocused Task-number: Reviewed-by: Warwick Allison
| * | Fix for graphics widget in the background stealing declarative item's focusJoona Petrell2010-05-131-2/+2
| | | | | | | | | | | | | | | Task-number: QTBUG-10584 Reviewed-by: Warwick Allison
| * | Fix broken benchmarks.Michael Brasser2010-05-131-5/+6
| | |
| * | Correctly assign bool to variant propertiesAaron Kennedy2010-05-124-0/+18
| | | | | | | | | | | | QTBUG-10623
| * | Improve Image docs. Move all fillMode image examples to fillModeBea Lam2010-05-121-84/+109
| | | | | | | | | | | | property docs and remove the animated gif.
| * | Flickable small API changes.Yann Bodson2010-05-126-141/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Split moving into movingHorizontally anf movingVertically - Split flicking into flickingHorizontally and flickingVertically - Rename flickDirection to flickableDirection - onMovementStarted, onMovementEnded, onFlickStarted and onFlickEnded signals removed Task-number: QTBUG-10572 Reviewed-by: Martin Jones
| * | Reset the dragDropItem to 0 when the item dies while dragging on top it.Alexis Menard2010-05-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | If you drag something on top of an item and the former is deleted then we need to reset the dragDropItem pointer to 0. Task-number:KDE BUG 232182 Reviewed-by:leo
| * | Avoid warning (and possible future crash) upon reload.Warwick Allison2010-05-121-2/+5
| | | | | | | | | | | | Task-number: QTBUG-10555
| * | Don't pass sequential (QNetworkReply) to image reader, it doesn't work well ↵Warwick Allison2010-05-121-1/+5
| | | | | | | | | | | | | | | | | | enough. Work around QTBUG-10622
| * | Stop GIF handler claiming it can report Size for sequential devices,Warwick Allison2010-05-121-2/+5
| | | | | | | | | | | | | | | | | | since it scans the entire image to do so (and then can't read the image). Task-number: QTBUG-10621
| * | Bail out early if the same target value is reassigned to a Behavior.Michael Brasser2010-05-121-0/+6
| | | | | | | | | | | | | | | Task-number: QTBUG-10586 Reviewed-by: leo
| * | Correctly position any input method popups for TextInput.Michael Brasser2010-05-121-0/+2
| | | | | | | | | | | | Reviewed-by: alexis
| * | Correctly resize TextInput in the presence of preedit text.Michael Brasser2010-05-121-3/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-10466 Reviewed-by: alexis
| * | Apply signal handler changes immediately.Michael Brasser2010-05-121-8/+3
| | | | | | | | | | | | | | | Fix regression in bindinganimation visual test introduced in 129940723d9145a4380f7e44c06cbaa88ee4053b.
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-124-37/+97
| |\ \
| | * | Don't use Q_UNUSED if you use parameters.Alexis Menard2010-05-111-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | That's many "use" in the sentence. Task-number:QT-1652 Reviewed-by:TrustMe
| | * | Doc improvementsBea Lam2010-05-111-18/+50
| | | |
| | * | Improve XmlListModel::namespaceDeclarations() docsBea Lam2010-05-111-2/+14
| | | | | | | | | | | | | | | | Task-number: QTBUG-10522
| | * | QDeclarativeViewPrivate should subclass QGraphicsViewPrivateBea Lam2010-05-112-15/+33
| | | | | | | | | | | | | | | | Task-number: QTBUG-10528
| * | | Ensure PathView "attribute" attached properties are created correctlyMartin Jones2010-05-113-12/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an item was created spontaneously (i.e. delegate is a package and some other view created the item), ensure its attached properties are correctly initialized. Task-number: QTBUG-10527
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-113-2/+53
| |\ \ \ | | |/ /
| | * | Ensure QPixmapCache does not flush pixmaps that are still in use.Warwick Allison2010-05-113-2/+53
| | |/ | | | | | | | | | | | | Task-number: QTBUG-10576 Reviewed-by: Alexis Menard
| * | Document Component::createObject() parent argument.Martin Jones2010-05-112-3/+3
| | | | | | | | | | | | Task-number: QTBUG-10617
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-113-14/+40
| |\ \ | | |/
| * | Don't store the role-property map for each individual item.Martin Jones2010-05-115-29/+47
| | | | | | | | | | | | | | | | | | | | | | | | C++ models share a single metaobject type, so we don't need to create role-property mappings for each individual item. Also warn on attempt to modify a role that the model is unaware of (part of QTBUG-10457)
* | | Update DEF files for Qt 4.7Shane Kearns2010-05-116-41/+129
| | | | | | | | | | | | | | | Task-Number: QTBUG-10251 Reviewed-by: Trust Me
* | | Fix slider stepping when used with keypad navigationMiikka Heikkinen2010-05-111-2/+6
| | | | | | | | | | | | | | | | | | | | | QElapsedTimer usage was corrected Task-number: QTBUG-9857 Reviewed-by: Alessandro Portale
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-05-11124-2834/+3269
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-1112-65/+63
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove test cases which cause stack overflow Fix compile errors Run autotests with minimal capabilities Documentation updates for Qt/Symbian on Linux development Allow EPOCROOT env var to be without trailing slash. Workaround for Symbian Open C bug in socket connect. Fix fetchedRoot test variable to work also in Symbian Add configure time checks for symbian environment Check for existance of sis file parameter to runonphone Fix thread synchronization issues in Symbian QFileSystemWatcher Disable compiling of the plugin when extra package not found Added missing UID3 for qsymbianbearer.dll. Enabled previously disabled Qt features. Fix includes so it compiles Use lowercase includes so it compiles in Linux too Fixed library dependency for Gnupoc. Removed the --export_all_vtbl from linking. Cleaned up the elf2e32 options a bit.
| * | | Correct Flipable back item based on parent, not scene transformAaron Kennedy2010-05-111-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flipable transformation consists of two parts: 1. Detecting that the back face is visible 2. Transforming the back item as though "it were on the front" These are two steps. The first should be done in scene coordinates, and the second relative to the Flipable parent. QTBUG-10532
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Michael Brasser2010-05-111-1/+3
| |\ \ \
| | * | | Round ideal width up to prevent incorrect word wrapping on Mac OS XAaron Kennedy2010-05-111-1/+3
| | | |/ | | |/| | | | | | | | | QTBUG-10539
| * | | Correct ownership of signal handlers in state changes.Michael Brasser2010-05-111-7/+28
| |/ / | | | | | | | | | | | | | | | | | | When a state uses override, we may apply the same replacesignalhandler on top of itself. Make sure we update ownership accordingly. Task-number: QTBUG-10523
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-105-14/+20
| |\ \
| | * | Fixes doc of mouse area's onEnteredLeonardo Sobral Cunha2010-05-101-3/+3
| | | | | | | | | | | | | | | | Task-number: QTBUG-9227
| | * | Prevent handling of Up/Down on Mac OS X, for consistency with other platforms.Warwick Allison2010-05-101-2/+7
| | | | | | | | | | | | | | | | Task-number: QTBUG-10438
| | * | Optimize QGW constructor.Alexis Menard2010-05-103-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly by avoiding sending useless QVariant at construction time. itemChange is virtual, the user implementation will never be called. Worst case the QGW one. Reviewed-by:janarve
| * | | Add some test assertsAaron Kennedy2010-05-101-0/+3
| |/ /
| * | Avoid changing header dependencies.Warwick Allison2010-05-102-4/+6
| | | | | | | | | | | | (should fix compile on Symbian)
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-08123-2810/+3208
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (131 commits) Avoid many unnecessary allocations, so so that paint engines attached to pixmaps Doc Fix autotests Fix autotests (remove import Qt.widgets) Add missing qml file to qdeclarativemousearea Doc fix Clean up example code, add white background behind text Update mouse area qmlvisual test to follow change QTBUG-10162 Fix autotest bug in MouseArea Avoid emitting release when the mouse is ungrabbed Resize qmlruntime window to new dimensions when orientation changes Compile with opengl enabled. Avoid repeated create/destroy at top list boundary with sub-pixel movement. Call QDeclarativeItem::geometryChanged() base implementation qdoc fixes. Avoid warnings as delegates with bindings to parent are created and destroyed. qdoc fixes TextInput echoMode doc. Make sure to call base class implementation. More cleanup ...
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-07123-2810/+3208
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (131 commits) Avoid many unnecessary allocations, so so that paint engines attached to pixmaps Doc Fix autotests Fix autotests (remove import Qt.widgets) Add missing qml file to qdeclarativemousearea Doc fix Clean up example code, add white background behind text Update mouse area qmlvisual test to follow change QTBUG-10162 Fix autotest bug in MouseArea Avoid emitting release when the mouse is ungrabbed Resize qmlruntime window to new dimensions when orientation changes Compile with opengl enabled. Avoid repeated create/destroy at top list boundary with sub-pixel movement. Call QDeclarativeItem::geometryChanged() base implementation qdoc fixes. Avoid warnings as delegates with bindings to parent are created and destroyed. qdoc fixes TextInput echoMode doc. Make sure to call base class implementation. More cleanup ...
| | | * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-0745-155/+378
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/dynamic/qml/itemCreation.js
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-0714-47/+161
| | | | |\ \
| | | | | * | DocAaron Kennedy2010-05-071-9/+24
| | | | | | |
| | | | | * | Fix autotestsAaron Kennedy2010-05-071-1/+1
| | | | | | |