diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2010-05-26 03:35:53 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2010-05-26 04:12:04 (GMT) |
| commit | 3e3a5a2a2eece6e0eff934c34f25c41699a45b78 (patch) | |
| tree | 7305d5bfaca5033f6832834eb30dc44e3871b9b7 /src/imports/webkit | |
| parent | 4fe568ffb7a59909b0c72bed7da959fd36702f19 (diff) | |
| download | Qt-3e3a5a2a2eece6e0eff934c34f25c41699a45b78.zip Qt-3e3a5a2a2eece6e0eff934c34f25c41699a45b78.tar.gz Qt-3e3a5a2a2eece6e0eff934c34f25c41699a45b78.tar.bz2 | |
Unify naming of import plugin targets
Task-number: QTBUG-10834
Reviewed-by: Warwick Allison
Diffstat (limited to 'src/imports/webkit')
| -rw-r--r-- | src/imports/webkit/plugin.cpp | 2 | ||||
| -rw-r--r-- | src/imports/webkit/qmldir | 2 | ||||
| -rw-r--r-- | src/imports/webkit/webkit.pro | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/webkit/plugin.cpp b/src/imports/webkit/plugin.cpp index e3d73ec..c8e56ba 100644 --- a/src/imports/webkit/plugin.cpp +++ b/src/imports/webkit/plugin.cpp @@ -63,5 +63,5 @@ QT_END_NAMESPACE #include "plugin.moc" -Q_EXPORT_PLUGIN2(webkitqmlplugin, QT_PREPEND_NAMESPACE(WebKitQmlPlugin)); +Q_EXPORT_PLUGIN2(qmlwebkitplugin, QT_PREPEND_NAMESPACE(WebKitQmlPlugin)); 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 diff --git a/src/imports/webkit/webkit.pro b/src/imports/webkit/webkit.pro index 77cbc4d..7b2ac66 100644 --- a/src/imports/webkit/webkit.pro +++ b/src/imports/webkit/webkit.pro @@ -1,4 +1,4 @@ -TARGET = webkitqmlplugin +TARGET = qmlwebkitplugin TARGETPATH = org/webkit include(../qimportbase.pri) @@ -18,7 +18,7 @@ symbian:{ load(data_caging_paths) include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) - importFiles.sources = webkitqmlplugin.dll qmldir + importFiles.sources = qmlwebkitplugin.dll qmldir importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH DEPLOYMENT = importFiles |