diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-14 12:29:28 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-14 12:29:54 +0200 |
| commit | 9be23eb946580519b2b0600cc854ec8050b90659 (patch) | |
| tree | 63ccf0e565f346a0788d937b004e01d2ec029b5e /src/core/user_script.cpp | |
| parent | 4f2e66f9d898e9c11a7ad6e552d0d47bb15d4051 (diff) | |
| parent | 981e38d2dc82c047c6ad8ec19427d3ac7434dc3c (diff) | |
Merge remote-tracking branch 'origin/5.6' into devwip/47-based
Change-Id: I0569b04ced3456a1d5d91e02e117963115fcf1b2
Diffstat (limited to 'src/core/user_script.cpp')
| -rw-r--r-- | src/core/user_script.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/core/user_script.cpp b/src/core/user_script.cpp index fb293c56a..179febc48 100644 --- a/src/core/user_script.cpp +++ b/src/core/user_script.cpp @@ -168,14 +168,3 @@ UserScriptData &UserScript::data() const } } // namespace QtWebEngineCore - -QT_BEGIN_NAMESPACE -uint qHash(const QtWebEngineCore::UserScript &script, uint seed) -{ - if (script.isNull()) - return 0; - return qHash(script.sourceCode(), seed) ^ qHash(script.name(), seed) - ^ (script.injectionPoint() | (script.runsOnSubFrames() << 4)) - ^ script.worldId(); -} -QT_END_NAMESPACE |