summaryrefslogtreecommitdiffstats
path: root/src/core/common/user_script_data.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-01-21 16:01:46 +0100
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-03-07 17:08:45 +0000
commit93ca852dbf00e93c07269e8cca389bc1222130d3 (patch)
tree62b541249b8908d717f877c9adb811930bd78a24 /src/core/common/user_script_data.cpp
parenta24df8f8e4ef0f99dbf5a6b09451bb39becaf66a (diff)
Basic adaptation to Chromium 49
Converts types, callbacks and headers to match Chromium 49. Task-number: QTBUG-51173 Change-Id: I544ef46e187105e250fea1b48b72d2c81a906640 Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core/common/user_script_data.cpp')
-rw-r--r--src/core/common/user_script_data.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/common/user_script_data.cpp b/src/core/common/user_script_data.cpp
index 21047d040..6f4b8cb05 100644
--- a/src/core/common/user_script_data.cpp
+++ b/src/core/common/user_script_data.cpp
@@ -44,6 +44,6 @@ UserScriptData::UserScriptData() : injectionPoint(AfterLoad)
, injectForSubframes(false)
, worldId(1)
{
- static uint64 idCount = 0;
+ static uint64_t idCount = 0;
scriptId = idCount++;
}