diff options
Diffstat (limited to 'src/shared/proparser')
-rw-r--r-- | src/shared/proparser/qmakebuiltins.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp index 734ef0165a0..8ceebd9cf0b 100644 --- a/src/shared/proparser/qmakebuiltins.cpp +++ b/src/shared/proparser/qmakebuiltins.cpp @@ -40,11 +40,9 @@ #include <qset.h> #include <qstringlist.h> #include <qtextstream.h> -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) -# include <qjsondocument.h> -# include <qjsonobject.h> -# include <qjsonarray.h> -#endif +#include <qjsondocument.h> +#include <qjsonobject.h> +#include <qjsonarray.h> #ifdef PROEVALUATOR_THREAD_SAFE # include <qthreadpool.h> #endif @@ -180,9 +178,7 @@ void QMakeEvaluator::initFunctionStatics() { "infile", T_INFILE }, { "count", T_COUNT }, { "isEmpty", T_ISEMPTY }, -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) { "parseJson", T_PARSE_JSON }, -#endif { "load", T_LOAD }, { "include", T_INCLUDE }, { "debug", T_DEBUG }, @@ -334,7 +330,6 @@ QMakeEvaluator::quoteValue(const ProString &val) return ret; } -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) static void addJsonValue(const QJsonValue &value, const QString &keyPrefix, ProValueMap *map); static void insertJsonKeyValue(const QString &key, const QStringList &values, ProValueMap *map) @@ -413,7 +408,6 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::parseJsonInto(const QByteArray &json return QMakeEvaluator::ReturnTrue; } -#endif QMakeEvaluator::VisitReturn QMakeEvaluator::writeFile(const QString &ctx, const QString &fn, QIODevice::OpenMode mode, @@ -1488,7 +1482,6 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( m_valuemapStack.top()[var] = statics.fakeValue; return ReturnTrue; } -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) case T_PARSE_JSON: { if (args.count() != 2) { evalError(fL1S("parseJson(variable, into) requires two arguments.")); @@ -1499,7 +1492,6 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( QString parseInto = args.at(1).toQString(m_tmp2); return parseJsonInto(json, parseInto, &m_valuemapStack.top()); } -#endif case T_INCLUDE: { if (args.count() < 1 || args.count() > 3) { evalError(fL1S("include(file, [into, [silent]]) requires one, two or three arguments.")); |