QmlDesigner: Fix build with tests

Amends c81d672bb0
and a854e0daa8.

Change-Id: I85d293a2abc437613be924084480a173190bda8b
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

src/plugins/qmldesigner/CMakeLists.txt

@@ -386,6 +386,7 @@ extend_qtc_plugin(QmlDesigner
     include/abstractproperty.h
     include/abstractview.h
     include/anchorline.h
+    include/annotation.h
     include/basetexteditmodifier.h
     include/bindingproperty.h
     include/bytearraymodifier.h
@@ -475,6 +476,7 @@ extend_qtc_plugin(QmlDesigner
     model/abstractproperty.cpp
     model/abstractview.cpp
     model/anchorline.cpp
+    model/annotation.cpp
     model/basetexteditmodifier.cpp
     model/bindingproperty.cpp
     model/componenttextmodifier.cpp
@@ -541,8 +543,7 @@ extend_qtc_plugin(QmlDesigner
 
 extend_qtc_plugin(QmlDesigner
   SOURCES_PREFIX components/annotationeditor
-  SOURCES annotation.cpp annotation.h
+  SOURCES annotationcommenttab.cpp annotationcommenttab.h annotationcommenttab.ui
-  annotationcommenttab.cpp annotationcommenttab.h annotationcommenttab.ui
   annotationeditordialog.cpp annotationeditordialog.h annotationeditordialog.ui
   annotationeditor.cpp annotationeditor.h
   annotationtool.cpp annotationtool.h

src/plugins/qmldesigner/components/annotationeditor/annotationeditor.pri

@@ -1,10 +1,8 @@
-HEADERS += $$PWD/annotation.h
 HEADERS += $$PWD/annotationtool.h
 HEADERS += $$PWD/annotationcommenttab.h
 HEADERS += $$PWD/annotationeditordialog.h
 HEADERS += $$PWD/annotationeditor.h
 
-SOURCES += $$PWD/annotation.cpp
 SOURCES += $$PWD/annotationtool.cpp
 SOURCES += $$PWD/annotationcommenttab.cpp
 SOURCES += $$PWD/annotationeditordialog.cpp

src/plugins/qmldesigner/components/formeditor/formeditorannotationicon.cpp

@@ -35,7 +35,6 @@
 #include <coreplugin/icore.h>
 #include <utils/theme/theme.h>
 #include <utils/stylehelper.h>
-#include <annotationeditor/annotation.h>
 #include <annotationeditor/annotationeditordialog.h>
 #include <formeditorscene.h>
 

src/plugins/qmldesigner/components/formeditor/formeditorannotationicon.h

@@ -25,17 +25,13 @@
 
 #pragma once
 
-#include <annotationeditor/annotation.h>
+#include <annotation.h>
+#include <modelnode.h>
 
 #include <QGraphicsItem>
 #include <QGraphicsObject>
 #include <QIcon>
 #include <QObject>
-#include <modelnode.h>
-
-QT_BEGIN_NAMESPACE
-QT_END_NAMESPACE
-
 
 namespace QmlDesigner {
 

src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp

@@ -25,8 +25,8 @@
 
 #include "selectionindicator.h"
 
+#include "annotation.h"
 #include <designeractionmanager.h>
-#include "annotationeditor/annotation.h"
 #include <formeditorannotationicon.h>
 
 #include <QPen>

src/plugins/qmldesigner/designercore/designercore-lib.pri

@@ -82,7 +82,8 @@ SOURCES += $$PWD/model/abstractview.cpp \
     $$PWD/model/anchorline.cpp \
     $$PWD/instances/puppetdialog.cpp \
     $$PWD/model/qmltimeline.cpp \
-    $$PWD/model/qmltimelinekeyframegroup.cpp
+    $$PWD/model/qmltimelinekeyframegroup.cpp \
+    $$PWD/model/annotation.cpp
 
 HEADERS += $$PWD/include/qmldesignercorelib_global.h \
     $$PWD/include/abstractview.h \
@@ -158,7 +159,8 @@ HEADERS += $$PWD/include/qmldesignercorelib_global.h \
     $$PWD/include/anchorline.h \
     $$PWD/instances/puppetdialog.h \
     $$PWD/include/qmltimeline.h \
-    $$PWD/include/qmltimelinekeyframegroup.h
+    $$PWD/include/qmltimelinekeyframegroup.h \
+    $$PWD/include/annotation.h
 
 FORMS += \
     $$PWD/instances/puppetdialog.ui

src/plugins/qmldesigner/designercore/model/modelnode.cpp

@@ -41,7 +41,7 @@
 #include "nodelistproperty.h"
 #include "nodeproperty.h"
 #include <rewriterview.h>
-#include "annotationeditor/annotation.h"
+#include "annotation.h"
 
 #include <utils/algorithm.h>
 

src/plugins/qmldesigner/qmldesignerplugin.qbs

@@ -246,6 +246,7 @@ Project {
                 "include/abstractproperty.h",
                 "include/abstractview.h",
                 "include/anchorline.h",
+                "include/annotation.h",
                 "include/basetexteditmodifier.h",
                 "include/bindingproperty.h",
                 "include/componenttextmodifier.h",
@@ -322,6 +323,7 @@ Project {
                 "model/abstractproperty.cpp",
                 "model/abstractview.cpp",
                 "model/anchorline.cpp",
+                "model/annotation.cpp",
                 "model/basetexteditmodifier.cpp",
                 "model/bindingproperty.cpp",
                 "model/componenttextmodifier.cpp",
@@ -639,8 +641,6 @@ Project {
             name: "extension"
             prefix: "components/"
             files: [
-                "annotationeditor/annotation.cpp",
-                "annotationeditor/annotation.h",
                 "annotationeditor/annotationcommenttab.cpp",
                 "annotationeditor/annotationcommenttab.h",
                 "annotationeditor/annotationcommenttab.ui",