summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@digia.com>2013-12-02 12:07:58 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-02 16:56:59 +0100
commit27f087d120c9a254ea81d89104d6d12c744987e2 (patch)
treedefcaebd59ff2fbbe9b5a1a9d722854e578c4efa
parenta3b20f87c4791ab294f770fb9f1b6a6a42349da8 (diff)
Remove superfluous assert from WebKitQmlPlugin::initializeEngine
The uri parameter is unused in this method and the ones called by it, so it should not be asserted on. Task-number: QTBUG-34066 Change-Id: I184fbad3e6e3d4786b4cc4e9f768f1c006309295 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
-rw-r--r--Source/WebKit/qt/declarative/plugin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/qt/declarative/plugin.cpp b/Source/WebKit/qt/declarative/plugin.cpp
index 56eac632d..1aa00a900 100644
--- a/Source/WebKit/qt/declarative/plugin.cpp
+++ b/Source/WebKit/qt/declarative/plugin.cpp
@@ -44,7 +44,7 @@ public:
#if defined(HAVE_WEBKIT2)
virtual void initializeEngine(QQmlEngine* engine, const char* uri)
{
- Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebKit"));
+ Q_UNUSED(uri);
engine->addImageProvider(QLatin1String("webicon"), new QWebIconImageProvider);
}
#endif