diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-05-26 05:16:51 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-05-26 05:16:51 (GMT) |
| commit | 3449d4594f312728926ac83ae8453bba40434bbd (patch) | |
| tree | d8eea1b22ed4e577c9a0d8248dd2f173b298c8c6 /src/imports/webkit/qmldir | |
| parent | e9a25332df933227c6b71a1654260d8421f56415 (diff) | |
| parent | ef2bc487ab9b66e052920b671e947abc4a6d8ef4 (diff) | |
| download | Qt-3449d4594f312728926ac83ae8453bba40434bbd.zip Qt-3449d4594f312728926ac83ae8453bba40434bbd.tar.gz Qt-3449d4594f312728926ac83ae8453bba40434bbd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/imports/webkit/qmldir')
| -rw-r--r-- | src/imports/webkit/qmldir | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/webkit/qmldir b/src/imports/webkit/qmldir index 258aa2c..dcfdd06 100644 --- a/src/imports/webkit/qmldir +++ b/src/imports/webkit/qmldir @@ -1 +1 @@ -plugin webkitqmlplugin +plugin qmlwebkitplugin |