From 098e68f6db24c31f053c71ae9b719a9f925452bc Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Wed, 4 Dec 2013 16:34:25 +0100 Subject: Use QVector when creating argv for the command line MSVC does not support variable length arrays. Change-Id: I59ef844256eb1b2666331e5ed0411f63e36883ba Reviewed-by: Jocelyn Turcotte Reviewed-by: Andras Becsi --- src/core/web_engine_context.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 03da61643..5dbb653cd 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -61,6 +61,7 @@ #include "type_conversion.h" #include #include +#include #include namespace { @@ -106,10 +107,11 @@ WebEngineContext::WebEngineContext(WebContentsAdapterClient::RenderingMode rende QList args; Q_FOREACH (const QString& arg, QCoreApplication::arguments()) args << arg.toUtf8(); - const char* argv[args.size()]; + + QVector argv(args.size()); for (int i = 0; i < args.size(); ++i) argv[i] = args[i].constData(); - CommandLine::Init(args.size(), argv); + CommandLine::Init(argv.size(), argv.constData()); CommandLine* parsedCommandLine = CommandLine::ForCurrentProcess(); parsedCommandLine->AppendSwitchASCII(switches::kUserAgent, webkit_glue::BuildUserAgentFromProduct("QtWebEngine/0.1")); -- cgit v1.2.3