diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-12 11:12:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-12 11:12:06 (GMT) |
| commit | 30ea8c49a50e7088c58c6c569450ec8673001962 (patch) | |
| tree | 2e8abe0e3697a27b84b5fa88c7d84f1572387452 /qmake/option.cpp | |
| parent | 4a47bf6a06a4f7ebbf2336cd643c50332ac76d6d (diff) | |
| parent | 404a37854520ef8ab4defffa7dc6331bc776a660 (diff) | |
| download | Qt-30ea8c49a50e7088c58c6c569450ec8673001962.zip Qt-30ea8c49a50e7088c58c6c569450ec8673001962.tar.gz Qt-30ea8c49a50e7088c58c6c569450ec8673001962.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3410 commits)
Compile fix for OSX.
Make compile. QmlMetaType::isObject() has changed to isQObject().
Fix warnings
Reference count shared expression data
Cleanup public QmlMetaType API
Fix case sensitivity bug in previous commit
Adds inputMethodHint property to TextEdit and TextInput.
Decouple Loader from QmlGraphicsItem
Make test more stable.
Fixed race condition in tst_qmlgraphicswebview::multipleWindows
Explicitly pass size to standard pixmap icon loaders.
Fix qmlgraphicswebview:pixelCache autotest by setting defaults on html
Fixed compile of these recently renamed tests.
Update QmlChanges.txt
Adds qml prefix to all declarative autotests
Removed "running: true" for animations used as propertyvaluesource
Animations are running by default when used as property source value
Fix QmlEngine offlineStoragePath test.
Fix Image test on Windows.
Fix FontLoader test on Windows.
...
Diffstat (limited to 'qmake/option.cpp')
0 files changed, 0 insertions, 0 deletions