diff options
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/Makefile.unix | 27 | ||||
| -rw-r--r-- | qmake/Makefile.win32 | 13 | ||||
| -rw-r--r-- | qmake/library/qmakebuiltins.cpp | 91 | ||||
| -rw-r--r-- | qmake/qmake.pri | 17 | ||||
| -rw-r--r-- | qmake/qmake.pro | 1 |
5 files changed, 143 insertions, 6 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index a77b1b22dc..2f04a88a42 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -19,6 +19,7 @@ QOBJS=qtextcodec.o qutfcodec.o qstring.o qstringbuilder.o qtextstream.o qiodevic qabstractfileengine.o qtemporaryfile.o qmap.o qmetatype.o qsettings.o qsystemerror.o qlibraryinfo.o \ qvariant.o qvsnprintf.o qlocale.o qlocale_tools.o qlinkedlist.o qnumeric.o \ qcryptographichash.o qxmlstream.o qxmlutils.o qlogging.o \ + qjson.o qjsondocument.o qjsonparser.o qjsonarray.o qjsonobject.o qjsonvalue.o \ $(QTOBJS) @@ -80,6 +81,12 @@ DEPEND_SRC = \ $(SOURCE_PATH)/src/corelib/global/qlogging.cpp \ $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp \ $(SOURCE_PATH)/tools/shared/windows/registry.cpp \ + $(SOURCE_PATH)/src/corelib/json/qjson.cpp \ + $(SOURCE_PATH)/src/corelib/json/qjsondocument.cpp \ + $(SOURCE_PATH)/src/corelib/json/qjsonparser.cpp \ + $(SOURCE_PATH)/src/corelib/json/qjsonarray.cpp \ + $(SOURCE_PATH)/src/corelib/json/qjsonobject.cpp \ + $(SOURCE_PATH)/src/corelib/json/qjsonvalue.cpp \ $(QTSRCS) CPPFLAGS = -g $(EXTRA_CPPFLAGS) \ @@ -93,7 +100,7 @@ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \ -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DPROEVALUATOR_FULL \ -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_COMPRESS \ -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \ - -DQT_CRYPTOGRAPHICHASH_ONLY_SHA1 + -DQT_CRYPTOGRAPHICHASH_ONLY_SHA1 -DQT_JSON_READONLY CXXFLAGS = $(EXTRA_CXXFLAGS) $(CPPFLAGS) @@ -385,4 +392,22 @@ qsystemlibrary.o: $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp registry.o: $(SOURCE_PATH)/tools/shared/windows/registry.cpp $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/windows/registry.cpp +qjson.o: $(SOURCE_PATH)/src/corelib/json/qjson.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/json/qjson.cpp + +qjsondocument.o: $(SOURCE_PATH)/src/corelib/json/qjsondocument.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/json/qjsondocument.cpp + +qjsonparser.o: $(SOURCE_PATH)/src/corelib/json/qjsonparser.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/json/qjsonparser.cpp + +qjsonarray.o: $(SOURCE_PATH)/src/corelib/json/qjsonarray.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/json/qjsonarray.cpp + +qjsonobject.o: $(SOURCE_PATH)/src/corelib/json/qjsonobject.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/json/qjsonobject.cpp + +qjsonvalue.o: $(SOURCE_PATH)/src/corelib/json/qjsonvalue.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/json/qjsonvalue.cpp + # DO NOT DELETE THIS LINE -- make depend depends on it diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 9a772d9760..c0d20111e9 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -41,7 +41,7 @@ CFLAGS_BARE = -c -Fo./ \ -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DPROEVALUATOR_FULL \ -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_COMPRESS \ -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \ - -DUNICODE -DQT_CRYPTOGRAPHICHASH_ONLY_SHA1 + -DUNICODE -DQT_CRYPTOGRAPHICHASH_ONLY_SHA1 -DQT_JSON_READONLY CFLAGS = -Yuqmake_pch.h -FIqmake_pch.h -Fpqmake_pch.pch $(CFLAGS_BARE) $(CFLAGS) $(EXTRA_CPPFLAGS) CXXFLAGS_BARE = $(CFLAGS_BARE) @@ -120,7 +120,13 @@ QTOBJS= \ qxmlstream.obj \ qxmlutils.obj \ qnumeric.obj \ - qlogging.obj + qlogging.obj \ + qjson.obj \ + qjsondocument.obj \ + qjsonparser.obj \ + qjsonarray.obj \ + qjsonobject.obj \ + qjsonvalue.obj first all: qmake.exe @@ -207,5 +213,8 @@ qmake_pch.obj: {$(SOURCE_PATH)\src\corelib\xml}.cpp{}.obj:: $(CXX) $(CXXFLAGS) $< +{$(SOURCE_PATH)\src\corelib\json}.cpp{}.obj:: + $(CXX) $(CXXFLAGS) $< + {$(SOURCE_PATH)\tools\shared\windows}.cpp{}.obj:: $(CXX) $(CXXFLAGS) $< diff --git a/qmake/library/qmakebuiltins.cpp b/qmake/library/qmakebuiltins.cpp index 10ef523e15..9cefbc8572 100644 --- a/qmake/library/qmakebuiltins.cpp +++ b/qmake/library/qmakebuiltins.cpp @@ -56,6 +56,11 @@ #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 #ifdef PROEVALUATOR_THREAD_SAFE # include <qthreadpool.h> #endif @@ -101,7 +106,7 @@ enum TestFunc { T_INVALID = 0, T_REQUIRES, T_GREATERTHAN, T_LESSTHAN, T_EQUALS, T_EXISTS, T_EXPORT, T_CLEAR, T_UNSET, T_EVAL, T_CONFIG, T_SYSTEM, T_DEFINED, T_CONTAINS, T_INFILE, - T_COUNT, T_ISEMPTY, T_INCLUDE, T_LOAD, T_DEBUG, T_LOG, T_MESSAGE, T_WARNING, T_ERROR, T_IF, + T_COUNT, T_ISEMPTY, T_PARSE_JSON, T_INCLUDE, T_LOAD, T_DEBUG, T_LOG, T_MESSAGE, T_WARNING, T_ERROR, T_IF, T_MKPATH, T_WRITE_FILE, T_TOUCH, T_CACHE }; @@ -178,6 +183,9 @@ 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 }, @@ -286,6 +294,75 @@ 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) +{ + map->insert(ProKey(key), ProStringList(values)); +} + +static void addJsonArray(const QJsonArray &array, const QString &keyPrefix, ProValueMap *map) +{ + QStringList keys; + for (int i = 0; i < array.count(); ++i) { + keys.append(QString::number(i)); + addJsonValue(array.at(i), keyPrefix + QString::number(i), map); + } + insertJsonKeyValue(keyPrefix + QLatin1String("_KEYS_"), keys, map); +} + +static void addJsonObject(const QJsonObject &object, const QString &keyPrefix, ProValueMap *map) +{ + foreach (const QString &key, object.keys()) + addJsonValue(object.value(key), keyPrefix + key, map); + + insertJsonKeyValue(keyPrefix + QLatin1String("_KEYS_"), object.keys(), map); +} + +static void addJsonValue(const QJsonValue &value, const QString &keyPrefix, ProValueMap *map) +{ + switch (value.type()) { + case QJsonValue::Bool: + insertJsonKeyValue(keyPrefix, QStringList() << (value.toBool() ? QLatin1String("true") : QLatin1String("false")), map); + break; + case QJsonValue::Double: + insertJsonKeyValue(keyPrefix, QStringList() << QString::number(value.toDouble()), map); + break; + case QJsonValue::String: + insertJsonKeyValue(keyPrefix, QStringList() << value.toString(), map); + break; + case QJsonValue::Array: + addJsonArray(value.toArray(), keyPrefix + QLatin1Char('.'), map); + break; + case QJsonValue::Object: + addJsonObject(value.toObject(), keyPrefix + QLatin1Char('.'), map); + break; + default: + break; + } +} + +static QMakeEvaluator::VisitReturn parseJsonInto(const QByteArray &json, const QString &into, ProValueMap *value) +{ + QJsonDocument document = QJsonDocument::fromJson(json); + if (document.isNull()) + return QMakeEvaluator::ReturnFalse; + + QString currentKey = into + QLatin1Char('.'); + + // top-level item is either an array or object + if (document.isArray()) + addJsonArray(document.array(), currentKey, value); + else if (document.isObject()) + addJsonObject(document.object(), currentKey, value); + else + return QMakeEvaluator::ReturnFalse; + + return QMakeEvaluator::ReturnTrue; +} +#endif + QMakeEvaluator::VisitReturn QMakeEvaluator::writeFile(const QString &ctx, const QString &fn, QIODevice::OpenMode mode, const QString &contents) @@ -1278,6 +1355,18 @@ 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.")); + return ReturnFalse; + } + + QByteArray json = values(args.at(0).toKey()).join(QLatin1Char(' ')).toUtf8(); + 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.")); diff --git a/qmake/qmake.pri b/qmake/qmake.pri index 39959efe7b..5012bd0206 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -83,7 +83,13 @@ bootstrap { #Qt code qvsnprintf.cpp \ qxmlstream.cpp \ qxmlutils.cpp \ - qlogging.cpp + qlogging.cpp \ + qjson.cpp \ + qjsondocument.cpp \ + qjsonparser.cpp \ + qjsonarray.cpp \ + qjsonobject.cpp \ + qjsonvalue.cpp HEADERS+= \ qbitarray.h \ @@ -126,7 +132,14 @@ bootstrap { #Qt code quuid.h \ qvector.h \ qxmlstream.h \ - qxmlutils.h + qxmlutils.h \ + qjson.h \ + qjsondocument.h \ + qjsonparser.h \ + qjsonwriter.h \ + qjsonarray.h \ + qjsonobject.h \ + qjsonvalue.h unix { SOURCES += qfilesystemengine_unix.cpp qfilesystemiterator_unix.cpp qfsfileengine_unix.cpp diff --git a/qmake/qmake.pro b/qmake/qmake.pro index 568ad41ce1..e680942716 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro @@ -20,6 +20,7 @@ VPATH += $$QT_SOURCE_TREE/src/corelib/global \ $$QT_SOURCE_TREE/src/corelib/plugin \ $$QT_SOURCE_TREE/src/corelib/xml \ $$QT_SOURCE_TREE/src/corelib/io \ + $$QT_SOURCE_TREE/src/corelib/json \ $$QT_SOURCE_TREE/tools/shared/windows INCLUDEPATH += . \ |