summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Compile after change b9d7f819b7bf9f7c39735377ae2e3e4d4afa1cf7Warwick Allison2010-01-111-0/+8
|
* Compile fix for QMLViewerThomas Hartmann2010-01-081-2/+2
| | | | QmlViewer only compiled with -nokia-developer on Windows
* Make it easier to understand if test fails.Warwick Allison2010-01-082-2/+5
|
* Test QmlModulePluginWarwick Allison2010-01-086-0/+211
|
* Must always ask factory loader, or else plugins will only load the second time.Warwick Allison2010-01-081-6/+5
|
* Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-01-085-0/+117
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2010-01-0814-96/+252
| |\ | | | | | | | | | into kinetic-declarativeui
| * | QML dynamic function benchmarkAaron Kennedy2010-01-085-0/+117
| | |
* | | PreferNetwork (the default) is fixed, no need to force PreferCache.Warwick Allison2010-01-081-1/+0
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-01-085-0/+97
|\ \ | |/ | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * QML signal handler benchmarkAaron Kennedy2010-01-085-0/+97
| |
* | Fix painting to pixmap.Warwick Allison2010-01-081-1/+1
| | | | | | | | | | If we render the graphics view in a pixmap effectiveClip is empty. From Marco
* | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-01-087-12/+510
|\ \ | |/ | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Optimization: Improve property read speedAaron Kennedy2010-01-084-10/+46
| |
| * Basic QML JS benchmarkAaron Kennedy2010-01-084-2/+464
| |
* | Allow QML types defined in both C++ and QML files to be in the same module.Warwick Allison2010-01-0812-78/+193
| |
* | docWarwick Allison2010-01-082-18/+59
|/ | | | Task-number: QTBUG-7125
* Add notifier for QmlGraphicsInputMarco Bubke2010-01-072-14/+68
| | | | | | | Bauhaus needs the notifier to track changes in the items. Task-number: BAUHAUS-243 Reviewed-by: Thomas Hartmann
* Add notifier for QmlGraphicsTextEditMarco Bubke2010-01-072-15/+47
| | | | | | | Bauhaus needs the notifier to track changes in the items. Task-number: BAUHAUS-243 Reviewed-by: Thomas Hartmann
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Alan Alpert2010-01-07200-1717/+9067
|\ | | | | | | into kinetic-declarativeui
| * Load qmlmodules plugins.Warwick Allison2010-01-078-0/+317
| | | | | | | | | | | | This allows projects which use the declarative module to add QML types through C++ modules, such that qmlviewer (or any QML) can import those types.
| * opt: move expr out of loopWarwick Allison2010-01-071-2/+2
| |
| * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-01-0711-41/+310
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Add notifier for QmlGraphicsTextMarco Bubke2010-01-062-9/+37
| | | | | | | | | | | | | | | | | | | | | Bauhaus needs the notifier to track changes in the items. Task-number: BAUHAUS-243 Reviewed-by: Kai Koehne
| | * Allow Bauhaus to reset hasPixelSizeMarco Bubke2010-01-061-3/+9
| | | | | | | | | | | | | | | | | | | | | We want to reset the pixelSize to a pointSize value. Task-number: BAUHAUS-244 Reviewed-by: Kai Koehne
| | * Check if the property is cached in QmlGraphicsVisualDataModel::stringValueMarco Bubke2010-01-061-8/+12
| | | | | | | | | | | | | | | | | | | | | This fixes a Bauhaus crash. Task-number: BAUHAUS-227 Reviewed-by: Kai Koehne
| | * Improve documentationAlan Alpert2010-01-057-21/+252
| | | | | | | | | | | | | | | Extend documentation on dynamically created objects and on integrating with existing applications. And make those pages more discoverable.
| * | Avoid spurious error messagesWarwick Allison2010-01-061-2/+4
| |/ | | | | | | Delegate is reused in Grid and PathView, so PathView attributes might not be defined
| * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-01-05177-1666/+8324
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Mark function contexts as temporaryAaron Kennedy2010-01-056-5/+18
| | | | | | | | | | | | QTBUG-5690
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiAaron Kennedy2010-01-05171-1661/+8306
| | |\
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-044-63/+87
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove the need to know the service owner when adding/removing signal rules. Use the watched service name list in matching incoming signals too. Change the QtDBus watched service list to a map to its owner. Update debug output to show the connection's ptr and thread
| | | | * Remove the need to know the service owner when adding/removing signal rules.Thiago Macieira2010-01-024-34/+21
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5979 Reviewed-By: TrustMe
| | | | * Use the watched service name list in matching incoming signals too.Thiago Macieira2010-01-021-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5979 Reviewed-By: TrustMe
| | | | * Change the QtDBus watched service list to a map to its owner.Thiago Macieira2010-01-022-17/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of simply counting how many times we're watching a service, also map a service to its owner. This allows us to provide a faster, cached GetNameOwner too. Technically, this could mean that a service that is started in-between event loops could remain invalid for a longer period of time. I'm not sure this is an issue -- will need some testing in KDE. Task-number: QTBUG-5979 Reviewed-By: TrustMe
| | | | * Update debug output to show the connection's ptr and threadThiago Macieira2010-01-021-10/+10
| | | | |
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-0116-134/+480
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update the scrolling code of FlickCharm Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 70b5989bdeea2f73bd950099fc0f0e954550ef54 ) Symbian build fix Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( c07df5686b431aa5d11643d00308d8f8f59d88b1 ) For maemo, do not strip the binaries during the installation. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( eb1c86da9f5fa43a0e126ef58ab11cbd4d200af7 )
| | | | * Update the scrolling code of FlickCharmBenjamin Poulain2009-12-301-110/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the behavior of the scrolling so it is more usable on small devices. Add a code path for accelerating the autoscrolling if paning over a auto-scrolling frame.
| | | | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-12-306-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 70b5989bdeea2f73bd950099fc0f0e954550ef54 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-12-30 Janne Koskinen <janne.p.koskinen@digia.com> Reviewed by Simon Hausmann. Upstream Symbian def files from Qt 4.6. These files define the ABI of QtWebKit on Symbian. * symbian/bwins/QtWebKitu.def: Added. * symbian/eabi/QtWebKitu.def: Added.
| | | | * Symbian build fixSimon Hausmann2009-12-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable bearer management support in WebKit for builds inside Qt. We can't depend on an external module that depends on what we're building right now :) This is just a stop-gap fix. Reviewed-by: Trust me
| | | | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-12-304-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( c07df5686b431aa5d11643d00308d8f8f59d88b1 ) Changes in WebKit/qt since the last update: * Disable HTML5 Datagrid * Fix RVCT build
| | | | * For maemo, do not strip the binaries during the installation.Adrian Constantin2009-12-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The binaries will be stripped during packaging. Reviewed-by: Tom Cooksey
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-3012-15/+255
| | | | |\ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( eb1c86da9f5fa43a0e126ef58ab11cbd4d200af7 )
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-2912-15/+255
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( eb1c86da9f5fa43a0e126ef58ab11cbd4d200af7 )
| | | | | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-12-2912-15/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( eb1c86da9f5fa43a0e126ef58ab11cbd4d200af7 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-12-14 Holger Hans Peter Freyther <zecke@selfish.org> Reviewed by Kenneth Rohde Christiansen. [Qt] Fix JavaScript prompt behavior for empty/null strings. https://bugs.webkit.org/show_bug.cgi?id=30914 The patch is based on the work done by Gupta Manish. In the default implementation of the JavaScript prompt we are using a QInputDialog to get the text and this has one quirk with regard to not entering any text. In other WebKit ports and in Firefox an empty string is returned but in the Qt case it is a null string. Change the API documentation in QWebPage to mention we want to have a non null string but do the fixup in the ChromeClientQt to support existing code. * Api/qwebpage.cpp: (QWebPage::javaScriptPrompt): Change API documentation * WebCoreSupport/ChromeClientQt.cpp: (WebCore::ChromeClientQt::runJavaScriptPrompt): Fixup null QString
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-294-11/+38
| | | |\ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Remove pointless const's from functions (internal API) Fixes crash when widget with WA_StaticContents child become toplevel.
| | | | * | Remove pointless const's from functions (internal API)Tom Cooksey2009-12-292-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is in response to the review for b063135, but was missed from that patch. Reviewed-By: Kim
| | | | * | Fixes crash when widget with WA_StaticContents child become toplevel.Olivier Goffart2009-12-292-7/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Happens for example if a DockWidget is undocked and has a child whith the WA_StaticContents attribute. The parent does not change (so newParent is false) but still, the top level widget change. So staticWidget need to be moved to the new backingstore. Reviewed-by: Benjamin Poulain Task-number: QTBUG-6883
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2009-12-293-4/+12
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Removed QtWebkit.dll from Qt.sis in Symbian builds
| | | | * | | Removed QtWebkit.dll from Qt.sis in Symbian buildsMiikka Heikkinen2009-12-293-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation for future removal of Webkit from Qt, Qt.sis no longer contains QtWebkit.dll. All projects that have webkit dependency now automatically also add dependency qtwebkit.sis into their .pkg files. To create qtwebkit.sis, run "make sis" in src\3rdparty\webkit\WebCore directory. Task-number: QTBUG-6841 Reviewed-by: Simon Hausmann Reviewed-by: Janne Koskinen