4 files changed, 8 insertions, 8 deletions
diff --git a/tools/qmlplugindump/.prev_CMakeLists.txt b/tools/qmlplugindump/.prev_CMakeLists.txt
index bf65d71c49..997f0ca446 100644
--- a/tools/qmlplugindump/.prev_CMakeLists.txt
+++ b/tools/qmlplugindump/.prev_CMakeLists.txt
@@ -8,7 +8,7 @@ qt_get_tool_target_name(target_name qmlplugindump)
 qt_add_tool(${target_name}
     TARGET_DESCRIPTION "QML Plugin Metadata Dumper"
     SOURCES
-        ../../src/qmlcompiler/qmlstreamwriter.cpp ../../src/qmlcompiler/qmlstreamwriter_p.h
+        ../../src/qmlcompiler/qqmljsstreamwriter.cpp ../../src/qmlcompiler/qqmljsstreamwriter_p.h
         main.cpp
         qmltypereader.cpp qmltypereader.h
     INCLUDE_DIRECTORIES
diff --git a/tools/qmlplugindump/CMakeLists.txt b/tools/qmlplugindump/CMakeLists.txt
index d8fdaeee8c..111f7dda24 100644
--- a/tools/qmlplugindump/CMakeLists.txt
+++ b/tools/qmlplugindump/CMakeLists.txt
@@ -9,7 +9,7 @@ qt_add_tool(${target_name}
     TARGET_DESCRIPTION "QML Plugin Metadata Dumper"
     TOOLS_TARGET Qml # special case
     SOURCES
-        ../../src/qmlcompiler/qmlstreamwriter.cpp ../../src/qmlcompiler/qmlstreamwriter_p.h
+        ../../src/qmlcompiler/qqmljsstreamwriter.cpp ../../src/qmlcompiler/qqmljsstreamwriter_p.h
         main.cpp
         qmltypereader.cpp qmltypereader.h
     INCLUDE_DIRECTORIES
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index bfc78f2974..aa78a9c6bc 100644
--- a/tools/qmlplugindump/main.cpp
+++ b/tools/qmlplugindump/main.cpp
@@ -60,7 +60,7 @@
 #include <algorithm>
 
 #include "qmltypereader.h"
-#include "qmlstreamwriter_p.h"
+#include "qqmljsstreamwriter_p.h"
 
 #ifdef QT_SIMULATOR
 #include <QtGui/private/qsimulatorconnection_p.h>
@@ -360,11 +360,11 @@ public:
 
 class Dumper
 {
-    QmlStreamWriter *qml;
+    QQmlJSStreamWriter *qml;
     QString relocatableModuleUri;
 
 public:
-    Dumper(QmlStreamWriter *qml) : qml(qml) {}
+    Dumper(QQmlJSStreamWriter *qml) : qml(qml) {}
 
     void setRelocatableModuleUri(const QString &uri)
     {
@@ -1346,7 +1346,7 @@ int main(int argc, char *argv[])
 
     // start dumping data
     QByteArray bytes;
-    QmlStreamWriter qml(&bytes);
+    QQmlJSStreamWriter qml(&bytes);
 
     qml.writeStartDocument();
     qml.writeLibraryImport(QLatin1String("QtQuick.tooling"), 1, 2);
diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro
index 217fe23bbe..2e6e793157 100644
--- a/tools/qmlplugindump/qmlplugindump.pro
+++ b/tools/qmlplugindump/qmlplugindump.pro
@@ -11,12 +11,12 @@ QTPLUGIN.platforms = qminimal
 INCLUDEPATH += $$PWD/../../src/qmlcompiler
 
 SOURCES += \
-    ../../src/qmlcompiler/qmlstreamwriter.cpp \
+    ../../src/qmlcompiler/qqmljsstreamwriter.cpp \
     main.cpp \
     qmltypereader.cpp
 
 HEADERS += \
-    ../../src/qmlcompiler/qmlstreamwriter_p.h \
+    ../../src/qmlcompiler/qqmljsstreamwriter_p.h \
     qmltypereader.h
 
 macx {