| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
| |
Make sure the 'stackBefore' sibling in ParentChanges is cleared if the
target is the last child.
|
|
|
|
| |
Task-number: QTBUG-9219
|
|
|
|
|
| |
Task-number: QTBUG-6617
Reviewed-by: Alexis Menard
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
| |
State-specific object lifecycle management will be addressed in a
future release.
Task-number: QTBUG-8318
|
|
|
|
| |
Task-number: QTBUG-9161
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Reduce amount of qmldir parsing
Fix local type lookup
Initialize variable.
Setting stacking order from top to bottom seems to work better.
Don't crash if an out of bounds model index is accessed.
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Reduce amount of qmldir parsing
Fix local type lookup
Initialize variable.
Setting stacking order from top to bottom seems to work better.
Don't crash if an out of bounds model index is accessed.
|
| | |
| | |
| | |
| | |
| | | |
This is done by storing the parsed components (QDeclarativeDirComponents).
There's still potential for optimization (QT-617)
|
| | |
| | |
| | |
| | |
| | |
| | | |
This change removes the hacky final baseUrl+TypeName+".qml" lookup.
In order to still support internal files in remote modules, a new
qmldir keyword "internal" is introduced.
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Initialize variable.
Setting stacking order from top to bottom seems to work better.
Don't crash if an out of bounds model index is accessed.
|
| | | | |
|
| | | |\ |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-9182
|
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-9184
|
|\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Moved QMAKE_MOC etc. variable declarations after symbian.conf inclusion
Use libusb to auto-detect the port to use to communicate with the phone
Whitespace
Make multimedia only depend on opengl when the latter is build
gcc for Symbian doesn't support gcc extensions like atomicity.h - disable
|
| |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Use libusb to auto-detect the port to use to communicate with the phone
Whitespace
Make multimedia only depend on opengl when the latter is build
gcc for Symbian doesn't support gcc extensions like atomicity.h - disable
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-By: axis
|
| | | | | |
|
|\ \ \ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
On 16-bit configs, using 16-bit textures gives us quite a bit
of performance extra, so making this extra effort prior
to uploading it seems worth it.
Reviewed-by: Samuel
|
|/ / / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This brings the actual behaviour in line with the doc of setDevice().
Reviewed-by: Trond
|
|/ / / /
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-8086
Reviewed-by: gabi
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
...
|