X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=thirdparty%2Fqjson%2Fparserrunnable.cpp;fp=thirdparty%2Fqjson%2Fparserrunnable.cpp;h=88baf4cf68e24ac3f7ab3385a6e199fdcc660f85;hb=0094c61568bff9f9dd7bafb711f111698e683831;hp=d09423e4cbb6c1ab5a7ea697062dedc4ffabc10e;hpb=c391265484ecb3baa2a00c80658c99ad65963ec6;p=apitrace diff --git a/thirdparty/qjson/parserrunnable.cpp b/thirdparty/qjson/parserrunnable.cpp index d09423e..88baf4c 100644 --- a/thirdparty/qjson/parserrunnable.cpp +++ b/thirdparty/qjson/parserrunnable.cpp @@ -3,16 +3,16 @@ * Copyright (C) 2009 Flavio Castelli * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this library; see the file COPYING.LIB. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. @@ -61,7 +61,7 @@ void ParserRunnable::run() qDebug() << "successfully converted json item to QVariant object"; emit parsingFinished(result, true, QString()); } else { - const QString errorText = tr("An error occured while parsing json: %1").arg(parser.errorString()); + const QString errorText = tr("An error occurred while parsing json: %1").arg(parser.errorString()); qCritical() << errorText; emit parsingFinished(QVariant(), false, errorText); }