From 48005fa33e27c704ce7c5e0a7b1b2209df67b5e1 Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
Date: Mon, 10 Nov 2014 03:26:45 +0100
Subject: [PATCH] Tolerate an empty android-extra-libs value
Skip the empty fields in the split. It's obvious that "" means nothing,
there's no other way to read the value.
It especially helps with machine-generated versions of the json files.
Change-Id: Idb957d4fa3076e908e5f437807b171f6ec56863c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
---
src/androiddeployqt/main.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp
index 3979b8f3b..41acfd75e 100644
--- a/src/androiddeployqt/main.cpp
+++ b/src/androiddeployqt/main.cpp
@@ -824,7 +824,7 @@ bool readInputFile(Options *options)
{
QJsonValue extraLibs = jsonObject.value("android-extra-libs");
if (!extraLibs.isUndefined())
- options->extraLibs = extraLibs.toString().split(QLatin1Char(','));
+ options->extraLibs = extraLibs.toString().split(QLatin1Char(','), QString::SkipEmptyParts);
}
{
--
GitLab