| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Removed an assert in the print dialog on windows
simple cleanup in QSplitter
Actually use GL texture cache when bindoptions are provided
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This assert was checking that the parent widget for the print dialog
was already created. That's useless since we immediately after call
winId().
Task-number: QTBUG-8684
Reviewed-by: gabi
|
| |
| |
| |
| |
| |
| | |
there is no need for a singleshot for deleteLater here
Reviewed-by: gabi
|
| |
| |
| |
| | |
Reviewed-by: Trond
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Add autoLoad property to multimedia declarative elements.
Fix; QML Video item is sensitive to property assignment order
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-8947
Reviewed-by: Andrew den Exter
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-8605
Reviewed-by: Andrew den Exter
|
|\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (151 commits)
Skip until after CI succeeds
Fixed install of qml imports when doing a vcproj build.
Disable tests temporarily
Remove warnings
Add missing semicolons. moc was confused and positionViewAtIndex not invokable.
Use the correct base URL in resolveUri
Remove timing sensitivity.
Optimize id checking.
Fix examples after 47fb07c9fdf47584ae55f3412102bbeef5576b04.
Don't use QScriptValueIterator to iterate over arrays.
Skip test, to be fixed.
Only release the binding once we're finished with its memory
Make it harder to accidentally delete a binding
Adjust test now that redundant contexts are not create due
Block modifications to internal QDeclarativeContexts
Don't destroy cookie jar until while someone may be using it.
Fix tests after 47fb07c9fdf47584ae55f3412102bbeef5576b04.
Another fix to find
Improve implicit "." import
Fix auto test
...
|
| |\ \ |
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
tests/auto/declarative/qdeclarativeecmascript/testtypes.h
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This qmake script had wrong logic as a result of a bad copy and paste
(probably from translations\translations.pro)
|
| | | | | |
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (147 commits)
Add missing semicolons. moc was confused and positionViewAtIndex not invokable.
Use the correct base URL in resolveUri
Remove timing sensitivity.
Optimize id checking.
Fix examples after 47fb07c9fdf47584ae55f3412102bbeef5576b04.
Don't use QScriptValueIterator to iterate over arrays.
Skip test, to be fixed.
Only release the binding once we're finished with its memory
Make it harder to accidentally delete a binding
Adjust test now that redundant contexts are not create due
Block modifications to internal QDeclarativeContexts
Don't destroy cookie jar until while someone may be using it.
Fix tests after 47fb07c9fdf47584ae55f3412102bbeef5576b04.
Another fix to find
Improve implicit "." import
Fix auto test
Fix type lookup with url
Fix default values on Textinput
Add an implicit import "." to types loaded from a local url
Fix crash
...
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (147 commits)
Add missing semicolons. moc was confused and positionViewAtIndex not invokable.
Use the correct base URL in resolveUri
Remove timing sensitivity.
Optimize id checking.
Fix examples after 47fb07c9fdf47584ae55f3412102bbeef5576b04.
Don't use QScriptValueIterator to iterate over arrays.
Skip test, to be fixed.
Only release the binding once we're finished with its memory
Make it harder to accidentally delete a binding
Adjust test now that redundant contexts are not create due
Block modifications to internal QDeclarativeContexts
Don't destroy cookie jar until while someone may be using it.
Fix tests after 47fb07c9fdf47584ae55f3412102bbeef5576b04.
Another fix to find
Improve implicit "." import
Fix auto test
Fix type lookup with url
Fix default values on Textinput
Add an implicit import "." to types loaded from a local url
Fix crash
...
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
id must be lowercase; types and namespaces must be uppercase
cannot conflict, so remove check.
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Do not try to instantiate types that are explicitely
forbidden in the qmldir (because the version does not match).
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The change moves the implicit "." import to the very end, i.e.
the first lookup. It also gets the content of a remote qmldir
from the resources.
|
| | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (132 commits)
Fix auto test
Fix type lookup with url
Fix default values on Textinput
Add an implicit import "." to types loaded from a local url
Fix crash
Don't use Qt3 support methods.
Crash
Add/delete albums in photoviewer.
Emits itemsRemoved() in QDeclarativeListModel::remove.
Readd the itemtree benchmarks for comparison purposes.
Allow enum constants as list element properties.
Compile
Cleanup benchmark a little
Really fix warning.
Fix warnings.
MouseArea works now with any QGraphicsObject
Make states test work with smaller font size.
Register QGraphicsWidget type.
Add ListView and GridView.indexAt() methods to get the index at a point.
Tests for default count(), get() values should be run on the worker
...
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This repairs 9727cb35b30e07d1f72100a39c8d23e438e2746c. The lookup
can only happen if we have a file import (and not a library import)
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The existence of a non-empty qmldir file (e.g. for defining
a plugin) should not change the lookup rules for qml files
via url
|
| | | | |\ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
configure.exe
src/declarative/util/qdeclarativelistmodel.cpp
tools/qml/qml.pro
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Task-number: BAUHAUS-389
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
This triggers the loading of the qmldir and the import of native
types from available plugins. The change puts native types on par
with types defined in qml files.
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
If the notifier gets swapped out during emitting, the endpoint is also
invalidated. Thus the "disconnected" writeback must track the endpoint
not just the Notifier.
|
| | | | |\ \ \ \ \ |
|
| | | | | |\ \ \ \ \ |
|
| | | | | |\ \ \ \ \ \ |
|
| | | | | | | | | | | | |
|
| | | | | |_|/ / / / /
| | | | |/| | | | | | |
|
| | | | | |/ / / / /
| | | | |/| | | | | |
|
| | | | |/ / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Task-number: QTBUG-5974
|
| | | | | | | | | |
|
| | | | |\ \ \ \ \ |
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Easy, you just need to change the property.
Reviewed-by:Martin Jones
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Reviewed-by:TrustMe
|
| | | | |/ / / / / |
|
| | | | |\ \ \ \ \ |
|
| | | | | |\ \ \ \ \ |
|
| | | | | | |\ \ \ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (112 commits)
Verbose unexpected errors.
One url for an *unqualilfied* import is not special.
Fix test failures
Optimization: Don't unnecessarily run VMEStack element constructors
Optimization: Reduce unnecessary QObject allocations
Reset QDeclarativeDeclarativeData::outerContext when the context is removed
Simplify QDeclarativeComponent::creationContext() logic
Optimization: Use id notifier for QtScript bindings
Optimization: Combine QDeclarativeDeclarativeData and QObject allocations
Fixes for the module import
Fix documentation
add alan's tic-tac-toe AI
Remove test in .pro file also
Remove unneeded #include and add needed header to .pri
Add easing changes to QmlChanges.txt
Update more animation on property value source docs.
Doc fixes.
QmlChanges.txt cleanup.
Remove WorkerListModel and integrate its functionality into ListModel.
Split post alpha API changes into a separate section.
...
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Stops tst_qdeclarativelanguage passing when network transparency breaks.
|
| | | | | | | | | | | | |
|
| | | | | | | | | | | | |
|
| | | | | | | | | | | | |
|
| | | | | | | | | | | | |
|