diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-16 01:29:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-16 01:29:47 (GMT) |
| commit | 140a96d0b860b045c18d53c1ac96e77b3893d31c (patch) | |
| tree | 3dc9885e18c8d37955e073d415c02ac1656e0f30 /doc/src/images | |
| parent | 07f724cd5abd0548fb32ed3469bde113daf028c4 (diff) | |
| parent | fc399f2cd81772fed179d59a6f53abe69a81083a (diff) | |
| download | Qt-140a96d0b860b045c18d53c1ac96e77b3893d31c.zip Qt-140a96d0b860b045c18d53c1ac96e77b3893d31c.tar.gz Qt-140a96d0b860b045c18d53c1ac96e77b3893d31c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (32 commits)
Correctly support translation in QDeclarativePixmapCache
Improve warning for non-Item delegates.
Correctly support translation in QDeclarativeCompiler
Small calculator fix.
Improve declarative calculator example.
Update examples autotest to use the runtime directly
Support valuetypes as method return values
Compile without Qt3 support.
Doc
Simplify dynamic resource loading to avoid cluttering Text API.
Add Component.onDestruction attached property
Use qmlInfo for image loading errors, not qWarning().
Visual test updates.
Rename section so that it's not linked to by references to "JavaScript"
Doc improvements
Comments
Remove unused parameter
Correctly resolve, and load, IMG tags in Text element.
Rename "sql" test so autotester doesn't get confused.
Should work now, don't skip.
...
Diffstat (limited to 'doc/src/images')
| -rw-r--r-- | doc/src/images/declarative-integrating-graphicswidgets.png | bin | 0 -> 1061 bytes |
| -rw-r--r-- | doc/src/images/declarative-samegame.png | bin | 0 -> 124904 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/declarative-integrating-graphicswidgets.png b/doc/src/images/declarative-integrating-graphicswidgets.png Binary files differnew file mode 100644 index 0000000..d57f4b9 --- /dev/null +++ b/doc/src/images/declarative-integrating-graphicswidgets.png diff --git a/doc/src/images/declarative-samegame.png b/doc/src/images/declarative-samegame.png Binary files differnew file mode 100644 index 0000000..2232df2 --- /dev/null +++ b/doc/src/images/declarative-samegame.png |
