diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
| commit | 49233e234e5c787396cadb2cea33b31ae0cd65c1 (patch) | |
| tree | 5410cb9a8fd53168bb60d62c54b654d86f03c38d /Source/WebKit/qt/declarative/plugin.cpp | |
| parent | b211c645d8ab690f713515dfdc84d80b11c27d2c (diff) | |
| download | qtwebkit-49233e234e5c787396cadb2cea33b31ae0cd65c1.tar.gz | |
Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)
New snapshot with Windows build fixes
Diffstat (limited to 'Source/WebKit/qt/declarative/plugin.cpp')
| -rw-r--r-- | Source/WebKit/qt/declarative/plugin.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/WebKit/qt/declarative/plugin.cpp b/Source/WebKit/qt/declarative/plugin.cpp index 988b36e0e..1d44be23f 100644 --- a/Source/WebKit/qt/declarative/plugin.cpp +++ b/Source/WebKit/qt/declarative/plugin.cpp @@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE #if QT_VERSION >= 0x050000 class WebKitQmlPlugin : public QQmlExtensionPlugin { + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "plugin.json") #else class WebKitQmlPlugin : public QDeclarativeExtensionPlugin { #endif @@ -88,4 +89,6 @@ QT_END_NAMESPACE #include "plugin.moc" +#if QT_VERSION < 0x050000 Q_EXPORT_PLUGIN2(qmlwebkitplugin, QT_PREPEND_NAMESPACE(WebKitQmlPlugin)); +#endif |