9 files changed, 44 insertions, 8 deletions
diff --git a/src/plugins/qmljseditor/CMakeLists.txt b/src/plugins/qmljseditor/CMakeLists.txt
new file mode 100644
index 0000000000..c931d1729d
--- /dev/null
+++ b/src/plugins/qmljseditor/CMakeLists.txt
@@ -0,0 +1,33 @@
+add_qtc_plugin(QmlJSEditor
+  DEPENDS LanguageUtils qmljs QmlEditorWidgets
+  PLUGIN_DEPENDS Core ProjectExplorer QmlJSTools TextEditor
+  SOURCES
+    qmlexpressionundercursor.cpp qmlexpressionundercursor.h
+    qmljsautocompleter.cpp qmljsautocompleter.h
+    qmljscompletionassist.cpp qmljscompletionassist.h
+    qmljscomponentfromobjectdef.cpp qmljscomponentfromobjectdef.h
+    qmljscomponentnamedialog.cpp qmljscomponentnamedialog.h qmljscomponentnamedialog.ui
+    qmljseditingsettingspage.cpp qmljseditingsettingspage.h qmljseditingsettingspage.ui
+    qmljseditor.cpp qmljseditor.h
+    qmljseditor_global.h
+    qmljseditorconstants.h
+    qmljseditordocument.cpp qmljseditordocument.h qmljseditordocument_p.h
+    qmljseditorplugin.cpp qmljseditorplugin.h
+    qmljsfindreferences.cpp qmljsfindreferences.h
+    qmljshighlighter.cpp qmljshighlighter.h
+    qmljshoverhandler.cpp qmljshoverhandler.h
+    qmljsoutline.cpp qmljsoutline.h
+    qmljsoutlinetreeview.cpp qmljsoutlinetreeview.h
+    qmljsquickfix.cpp qmljsquickfix.h
+    qmljsquickfixassist.cpp qmljsquickfixassist.h
+    qmljsquickfixes.cpp
+    qmljsreuse.cpp qmljsreuse.h
+    qmljssemantichighlighter.cpp qmljssemantichighlighter.h
+    qmljssemanticinfoupdater.cpp qmljssemanticinfoupdater.h
+    qmljstextmark.cpp qmljstextmark.h
+    qmljswrapinloader.cpp qmljswrapinloader.h
+    qmloutlinemodel.cpp qmloutlinemodel.h
+    qmltaskmanager.cpp qmltaskmanager.h
+    quicktoolbar.cpp quicktoolbar.h
+  EXPLICIT_MOC qmljseditor.h
+)
diff --git a/src/plugins/qmljseditor/qmljscompletionassist.cpp b/src/plugins/qmljseditor/qmljscompletionassist.cpp
index b307cb59ab..a581a2a2f3 100644
--- a/src/plugins/qmljseditor/qmljscompletionassist.cpp
+++ b/src/plugins/qmljseditor/qmljscompletionassist.cpp
@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #include "qmljscompletionassist.h"
+#include "qmljseditor.h"
 #include "qmljseditorconstants.h"
 #include "qmljsreuse.h"
 #include "qmlexpressionundercursor.h"
diff --git a/src/plugins/qmljseditor/qmljscompletionassist.h b/src/plugins/qmljseditor/qmljscompletionassist.h
index c737587f88..df697ef5e1 100644
--- a/src/plugins/qmljseditor/qmljscompletionassist.h
+++ b/src/plugins/qmljseditor/qmljscompletionassist.h
@@ -25,8 +25,9 @@
 
 #pragma once
 
-#include "qmljseditor.h"
+#include "qmljseditor_global.h"
 
+#include <qmljstools/qmljssemanticinfo.h>
 #include <texteditor/codeassist/assistproposalitem.h>
 #include <texteditor/codeassist/genericproposalmodel.h>
 #include <texteditor/codeassist/completionassistprovider.h>
diff --git a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.h b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.h
index e61b992996..1d6dc4cdc4 100644
--- a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.h
+++ b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.h
@@ -25,6 +25,7 @@
 
 #pragma once
 
+#include "qmljseditor_global.h"
 #include "qmljsquickfix.h"
 
 namespace QmlJSEditor {
diff --git a/src/plugins/qmljseditor/qmljsoutline.h b/src/plugins/qmljseditor/qmljsoutline.h
index 0a50667ae2..1e4b1d20d1 100644
--- a/src/plugins/qmljseditor/qmljsoutline.h
+++ b/src/plugins/qmljseditor/qmljsoutline.h
@@ -25,8 +25,6 @@
 
 #pragma once
 
-#include "qmljseditor.h"
-
 #include <texteditor/ioutlinewidget.h>
 
 #include <QSortFilterProxyModel>
@@ -42,6 +40,7 @@ namespace QmlJS { class Editor; }
 namespace QmlJSEditor {
 namespace Internal {
 
+class QmlJSEditorWidget;
 class QmlJSOutlineTreeView;
 
 class QmlJSOutlineFilterModel : public QSortFilterProxyModel
diff --git a/src/plugins/qmljseditor/qmljsquickfix.h b/src/plugins/qmljseditor/qmljsquickfix.h
index 856b4f29c8..37d4c134b6 100644
--- a/src/plugins/qmljseditor/qmljsquickfix.h
+++ b/src/plugins/qmljseditor/qmljsquickfix.h
@@ -25,8 +25,6 @@
 
 #pragma once
 
-#include "qmljseditor.h"
-
 #include <texteditor/quickfix.h>
 #include <qmljs/parser/qmljsastfwd_p.h>
 #include <qmljs/qmljsdocument.h>
diff --git a/src/plugins/qmljseditor/qmljsquickfixassist.cpp b/src/plugins/qmljseditor/qmljsquickfixassist.cpp
index 21b44faaa5..37efbaf39c 100644
--- a/src/plugins/qmljseditor/qmljsquickfixassist.cpp
+++ b/src/plugins/qmljseditor/qmljsquickfixassist.cpp
@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #include "qmljsquickfixassist.h"
+#include "qmljseditor.h"
 #include "qmljseditorconstants.h"
 #include "qmljseditordocument.h"
 
diff --git a/src/plugins/qmljseditor/qmljsquickfixassist.h b/src/plugins/qmljseditor/qmljsquickfixassist.h
index f638465d4b..83d328fc80 100644
--- a/src/plugins/qmljseditor/qmljsquickfixassist.h
+++ b/src/plugins/qmljseditor/qmljsquickfixassist.h
@@ -25,9 +25,8 @@
 
 #pragma once
 
-#include "qmljseditor.h"
-
 #include <qmljstools/qmljsrefactoringchanges.h>
+#include <qmljstools/qmljssemanticinfo.h>
 
 #include <texteditor/codeassist/assistinterface.h>
 #include <texteditor/codeassist/iassistprovider.h>
@@ -35,6 +34,8 @@
 namespace QmlJSEditor {
 namespace Internal {
 
+class QmlJSEditorWidget;
+
 class QmlJSQuickFixAssistInterface : public TextEditor::AssistInterface
 {
 public:
diff --git a/src/plugins/qmljseditor/qmljssemanticinfoupdater.h b/src/plugins/qmljseditor/qmljssemanticinfoupdater.h
index 85a3fce29f..bfd32596fb 100644
--- a/src/plugins/qmljseditor/qmljssemanticinfoupdater.h
+++ b/src/plugins/qmljseditor/qmljssemanticinfoupdater.h
@@ -25,7 +25,8 @@
 
 #pragma once
 
-#include "qmljseditor.h"
+#include <qmljs/qmljsdocument.h>
+#include <qmljstools/qmljssemanticinfo.h>
 
 #include <QWaitCondition>
 #include <QModelIndex>