| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
6ed43975f6733265b8b91b00a9a212076d896ef9 was not correct fix (just invalidated the test)
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (144 commits)
Fix declarative examples autotest, avoid using native separators
Doc: update Rectangle smooth painting screenshot.
Add some TextInput properties and methods
Remove GraphicsObjectContainer from the documentation.
import Qt 4.6 -> import Qt 4.7
Move documentation code to snippet.
Test fix.
Fix test
Fix test on QWS.
Fix PathView crash.
Make bindings dump more useful
Improve font value type documentation.
coding conventions
Doc fixes
Warning
Read Maemo orientation at startup
Exclude gestures from examples autotest
Exclude proxywidgets from examples autotest
Fix crash on QScriptProgram destruction
doc fixes
...
|
| |\ |
|
| | | |
|
| |\ \
| | |/
| | |
| | |
| | |
| | | |
Conflicts:
src/declarative/graphicsitems/qdeclarativetextinput.cpp
src/declarative/graphicsitems/qdeclarativetextinput_p.h
|
| | | |
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-9753
|
| | |\ |
|
| | | | |
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
doc/src/declarative/javascriptblocks.qdoc
|
| | | | |\
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (130 commits)
Warning
Read Maemo orientation at startup
Exclude gestures from examples autotest
Exclude proxywidgets from examples autotest
Fix crash on QScriptProgram destruction
doc fixes
Start documenting coding conventions
Adds missing qml file to qdeclarativeflipable autotest
Revert "Better reporting of extension plugin loading errors."
Doc
Fix graphicswidget auto-test.
Add Mac OS X bundle description for qml runtime
Cleanup
Disallow writes to read-only value type properties
Allow undefined to be assigned to QVariant properties
Add a Qt.isQtObject() method
Fix crash in QML library imports
Remove QT_VERSION checks in QML
List properties aren't read-only
Small doc fix.
...
|
| | | | | | |
|
| | | |_|/
| | |/| | |
|
| | |/ / |
|
| | | |
| | | |
| | | |
| | | | |
This reverts commit e0dcdbd2984299665b9b784b201289219b9978d3.
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (119 commits)
Add Mac OS X bundle description for qml runtime
Cleanup
Disallow writes to read-only value type properties
Allow undefined to be assigned to QVariant properties
Add a Qt.isQtObject() method
Fix crash in QML library imports
Remove QT_VERSION checks in QML
List properties aren't read-only
Small doc fix.
Make sure WorkerScript thread is stopped on deletion. This also fixes
Release ListModel's worker agent on deletion.
Doc fixes
Fix example
Example code style improvements
Enable other wrapping modes.
TextEdit::wrap changed to TextEdit::wrapMode enumeration
Remove use of obsolete "Script" element.
unwarn
Replace "var" with "variant" in tests
Fix test after deletion of GraphicsObjectContainer.
...
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | | |
QTBUG-9685
|
| | | | |
| | | | |
| | | | |
| | | | | |
QTBUG-9704
|
| | | | |
| | | | |
| | | | |
| | | | | |
QTBUG-9705
|
| | | | |
| | | | |
| | | | |
| | | | | |
QTBUG-9705
|
| | | | |
| | | | |
| | | | |
| | | | | |
We only support Qt 4.7 now.
|
| | | | | |
|
| | | | | |
|
| | | |\ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
the leaking of the worker agent in ListModel.
|
| | | | | | |
|
| | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
WrapAnywhere - Text can be wrapped at any point on a line, even if it
occurs in the middle of a word.
WrapAtWordBoundaryOrAnywhere - If possible, wrapping occurs at a word
boundary; otherwise it will occur at the appropriate point on the line,
even in the middle of a word.
|
| | | |\ \ |
|
| | | | | | |
|
| | | | | | |
|
| | | |\ \ \
| | | | |/ / |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Make sure bindings in PropertyChanges resolve urls correctly. Also
refactor the code so that PropertyChanges will always use the
standard url resolution support provided by QDeclarativeProperty.
Task-number: QTBUG-9571
|
| | | | |\ \ |
|
| | | | | |\ \ |
|
| | | | | | | | |
|
| | | | | |/ /
| | | | |/| |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
In QML "var"s are not the same as JavaScript vars - they are QVariants
instead. However, as they behave in a similar enough fashion to native
JavaScript it can be confusing to developers when they are called "var".
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This commit deletes the uneeded classes/declarations since we have now
an inline support for QGraphicsObject based classes. QGraphicsLayout
bindings works the same way because the layout property has been added
to QGraphicsWidget. The only feature that is missing for now (because
of the deletion of GraphicsObjectContainer) is the anchoring support.
We will probably take a look on how to support this feature properly
with no wrapper.
Task-number:QTBUG-9456
Reviewed-by:Michael Brasser
|
| | | |\ \ \ \
| | | | |/ / / |
|
| | | | |/ /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The TextInput has support for scrolling now so it's quite usable.
You can deactivate the auto scrolling with a property if you want to
do crazy animation while scrolling. This commit also fixed several bugs
with the current implementation especially regarding aligments : selection
was broken, moving the cursor also -> fixed. I have also added a tiny fix when
the TextInput lost the focus -> the selection is cleared.
Task-number:QT-2745
Reviewed-by:Michael Brasser
|
| | | |/ /
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-9697
|
| | | |\ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
In shadow build environments, we cannot enforce that shared
library objects for plugins are located in the same directory
as the qmldir file. This makes it hard for Creator to support
mixed projects (qml/c++).
In order to gain more flexibility, the patch introduces a
pluginPathList to QDeclarativeEngine, which completes the existing
importsPathList.
The pluginPathList defaults to ["."], which indicates the directory
where the qmldir file is located in.
The qml viewer tool gains a command line option -P to add to the
pluginPathList.
For consistency, the -L option ("Library") has been renamed to
-I ("Import"). QDeclarativeEngine::importExtension() has been
renamed to QDeclarativeEngine::importPlugin().
The documentation has been adjusted accordingly.
Done with erikv.
Reviewed-by: erikv
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-9701
|
| | | | | | |
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QTBUG-9538
|