summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2013-12-04 16:34:25 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-04 22:15:56 +0100
commit098e68f6db24c31f053c71ae9b719a9f925452bc (patch)
treedc18c83fec03f63860b4274ce0504470aeb77dab /src
parent355ef66c35350c04147a0b05f3116dca7477aa2c (diff)
Use QVector when creating argv for the command line
MSVC does not support variable length arrays. Change-Id: I59ef844256eb1b2666331e5ed0411f63e36883ba Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/core/web_engine_context.cpp6
1 files changed, 4 insertions, 2 deletions
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 <QGuiApplication>
#include <QStringList>
+#include <QVector>
#include <qpa/qplatformnativeinterface.h>
namespace {
@@ -106,10 +107,11 @@ WebEngineContext::WebEngineContext(WebContentsAdapterClient::RenderingMode rende
QList<QByteArray> args;
Q_FOREACH (const QString& arg, QCoreApplication::arguments())
args << arg.toUtf8();
- const char* argv[args.size()];
+
+ QVector<const char*> 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"));