summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix crash in ParentAnimation.Michael Brasser2010-05-141-8/+9
| | | | | | When rolling-back a parent change, the actions are in reverse order. Task-number: QTBUG-10671
* Minor declarative webview tweaksAlan Alpert2010-05-131-2/+5
| | | | | | | Added a comment to the class docs, and cleaned up the visual tests a little. However the visual tests are old and text heavy, and since we never seem to check them we might wait on updating them for a little longer.
* Removed dependency of QDeclarativeWebView to private Qt (Declarative) APISimon Hausmann2010-05-132-163/+106
| | | | | Exchanged the use of QDeclarativePaintedItem with the use of QGraphicsWebView and its tiled backing store.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-1376-492/+1135
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-1310-59/+155
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Follow-up on Flickable changes. ListModel::get() should return undefined if bad index specified Add an example spinner. Fix crash on remote content. Dates and variants are not considered nested objects
| | * Follow-up on Flickable changes.Yann Bodson2010-05-135-44/+94
| | | | | | | | | | | | | | | | | | | | | - flicking and moving properties will not be removed - onMovement* and onFlick* signals are back in Reviewed-by: Martin Jones
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-133-3/+38
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-131-10/+18
| | | |\
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-1343-367/+609
| | | |\ \
| | | * | | Add an example spinner.Martin Jones2010-05-133-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add missing increment/decrementCurrentIndex() slots to PathView, and tweak the number of points cached along a Path.
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1327-136/+251
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | ListModel::get() should return undefined if bad index specifiedBea Lam2010-05-131-10/+18
| | | | |/ | | | |/|
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-1326-125/+231
| | | |\ \
| | | * | | Dates and variants are not considered nested objectsAaron Kennedy2010-05-131-1/+2
| | | | | |
| | * | | | Fix crash on remote content.Warwick Allison2010-05-131-1/+3
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Breakage was actually quite bad, just hard to reproduce. Task-number: QTBUG-10565
| * | | | 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
| | | |/ / | | |/| |
| * | | | 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.
| * | | | | fix webkit crash when accessing network on SymbianJanne Koskinen2010-05-111-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes crash on startup and crashes on network requests Task-number: QTBUG-9820 Reviewed-by: Janne Anttila
| * | | | Workaround for Symbian Open C bug in socket connect.Janne Anttila2010-05-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Socket connect in Symbian may return non-standard EPIPE error, after which the connection is terminated. Added Symbian specific workaround to set socket to UnconnectedState if EPIPE errno is received. In addition a bug report for Open C is created: http://developer.symbian.org/bugs/show_bug.cgi?id=2676 Task-number: QT-3362 Reviewed-by: Aleksandar Sasha Babic Reviewed-by: Markus Goetz
| * | | | Merge commit 'origin/4.7' into symbian47Thomas Zander2010-05-1030-654/+933
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h
| * | | | | Fix fetchedRoot test variable to work also in SymbianMiikka Heikkinen2010-05-072-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RVCT builds cannot seem to be able to deal with data symbols at runtime, so made accessors for fetchedRoot test variable. Also moved it out of QFileInfoGatherer class as there is no need to have it there. Reviewed-by: Janne Koskinen
| * | | | | Fix thread synchronization issues in Symbian QFileSystemWatcherMiikka Heikkinen2010-05-062-45/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian the QSymbianFileSystemWatcherEngine thread now stays running as long as the instance is alive to avoid repeatedly stopping and restarting the thread as watched paths are removed and added. Also fixed issue of misreporting adding failure in cases where both adds and removes were done in quick succession. Task-number: QTBUG-10091 Reviewed-by: Shane Kearns
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-067-15/+23
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: 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.
| | * | | | | Disable compiling of the plugin when extra package not foundThomas Zander2010-05-042-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The plugin will only compile when the symbian audiorouting API is installed which is not there by default. So check for that. The configure check should be added soon too.
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-045-11/+16
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: 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.
| | | * | | | | Added missing UID3 for qsymbianbearer.dll.Espen Riskedal2010-05-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without a proper UID3 it is not possible to sign Qt.sis at symbiansigned.com. I also reserved the UID3 in our Wiki pages Reviewed-by: Aleksandar Babic
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-034-11/+15
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: 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.
| | | | * | | | | Fix includes so it compilesThomas Zander2010-05-032-3/+2
| | | | | | | | |
| | | | * | | | | Use lowercase includes so it compiles in Linux tooThomas Zander2010-05-031-7/+7
| | | | | | | | |
| | | | * | | | | Fixed library dependency for Gnupoc.axis2010-05-031-1/+6
| | | | | | | | |
* | | | | | | | | Note that you need to unset a flag to create a visual itemAlan Alpert2010-05-131-1/+4
| |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This needs to be documented as long as its true, or else it's a common source of confusion when writing QML items.
* | | | | | | | 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