diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-10-02 12:52:05 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-10-05 14:58:58 +0200 |
| commit | 31302761f0cab83ad412797afe8f39a497b02531 (patch) | |
| tree | b8db32c966491bc2c42e352518203dbad9dc63dc /src/qmltyperegistrar | |
| parent | 4f44f82b9f152572222d5d9db78faa5c1db3413c (diff) | |
QmlCompiler: Rename QmlStreamWriter
The names should start with a common prefix.
Change-Id: Ib2cc247d459d78de5f0a8ea0be73b89429154475
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qmltyperegistrar')
| -rw-r--r-- | src/qmltyperegistrar/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/qmltyperegistrar/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/qmltyperegistrar/qmltyperegistrar.pro | 4 | ||||
| -rw-r--r-- | src/qmltyperegistrar/qmltypescreator.h | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/qmltyperegistrar/.prev_CMakeLists.txt b/src/qmltyperegistrar/.prev_CMakeLists.txt index 7c2bfe5de7..5d77e64c67 100644 --- a/src/qmltyperegistrar/.prev_CMakeLists.txt +++ b/src/qmltyperegistrar/.prev_CMakeLists.txt @@ -8,7 +8,7 @@ qt_get_tool_target_name(target_name qmltyperegistrar) qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Types Registrar" SOURCES - ../qmlcompiler/qmlstreamwriter.cpp ../qmlcompiler/qmlstreamwriter_p.h + ../qmlcompiler/qqmljsstreamwriter.cpp ../qmlcompiler/qqmljsstreamwriter_p.h qmltyperegistrar.cpp qmltypesclassdescription.cpp qmltypesclassdescription.h qmltypescreator.cpp qmltypescreator.h diff --git a/src/qmltyperegistrar/CMakeLists.txt b/src/qmltyperegistrar/CMakeLists.txt index 5f6568ac37..1269461c3a 100644 --- a/src/qmltyperegistrar/CMakeLists.txt +++ b/src/qmltyperegistrar/CMakeLists.txt @@ -9,7 +9,7 @@ qt_add_tool(${target_name} TARGET_DESCRIPTION "QML Types Registrar" TOOLS_TARGET Qml # special case SOURCES - ../qmlcompiler/qmlstreamwriter.cpp ../qmlcompiler/qmlstreamwriter_p.h + ../qmlcompiler/qqmljsstreamwriter.cpp ../qmlcompiler/qqmljsstreamwriter_p.h qmltyperegistrar.cpp qmltypesclassdescription.cpp qmltypesclassdescription.h qmltypescreator.cpp qmltypescreator.h diff --git a/src/qmltyperegistrar/qmltyperegistrar.pro b/src/qmltyperegistrar/qmltyperegistrar.pro index eafaab6559..eaee9b6eb4 100644 --- a/src/qmltyperegistrar/qmltyperegistrar.pro +++ b/src/qmltyperegistrar/qmltyperegistrar.pro @@ -11,13 +11,13 @@ QMAKE_TARGET_DESCRIPTION = QML Types Registrar INCLUDEPATH += $$PWD/../qmlcompiler SOURCES += \ - ../qmlcompiler/qmlstreamwriter.cpp \ + ../qmlcompiler/qqmljsstreamwriter.cpp \ qmltyperegistrar.cpp \ qmltypesclassdescription.cpp \ qmltypescreator.cpp HEADERS += \ - ../qmlcompiler/qmlstreamwriter_p.h \ + ../qmlcompiler/qqmljsstreamwriter_p.h \ qmltypesclassdescription.h \ qmltypescreator.h diff --git a/src/qmltyperegistrar/qmltypescreator.h b/src/qmltyperegistrar/qmltypescreator.h index 9fc62f9a9e..2216a8a967 100644 --- a/src/qmltyperegistrar/qmltypescreator.h +++ b/src/qmltyperegistrar/qmltypescreator.h @@ -30,7 +30,7 @@ #define QMLTYPESCREATOR_H #include "qmltypesclassdescription.h" -#include "qmlstreamwriter_p.h" +#include "qqmljsstreamwriter_p.h" #include <QtCore/qstring.h> #include <QtCore/qset.h> @@ -58,7 +58,7 @@ private: void writeComponents(); QByteArray m_output; - QmlStreamWriter m_qml; + QQmlJSStreamWriter m_qml; QVector<QJsonObject> m_ownTypes; QVector<QJsonObject> m_foreignTypes; QString m_module; |