diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-20 16:01:37 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-20 16:04:42 +0100 |
| commit | 1f474fcc4cd47a85ce8d99f07d18b46ef2af5898 (patch) | |
| tree | d4e52b5ac98343b4c2417d622164bf320d781a59 /src/core/web_engine_context.cpp | |
| parent | 4cc28c7c89f794d469f5e8f778ff05effe8c646f (diff) | |
| parent | 1173d48149a8133b607894b67e1ec32de68e21e8 (diff) | |
Merge branch '5.6' into dev
Change-Id: I05fe27b8321944cf68cc96dfa9dfcaeb54c8c8cd
Diffstat (limited to 'src/core/web_engine_context.cpp')
| -rw-r--r-- | src/core/web_engine_context.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 5be35b348..4d1cbf3d4 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -200,7 +200,7 @@ WebEngineContext::WebEngineContext() , m_browserRunner(content::BrowserMainRunner::Create()) , m_globalQObject(new QObject()) { - QList<QByteArray> args; + QVector<QByteArray> args; Q_FOREACH (const QString& arg, QCoreApplication::arguments()) args << arg.toUtf8(); |