QmlDesigner: export core functionality

We export the core functionality of the model allowing
other plugins to use it.

The general functionality was already there, but I had
to rename the macro to avoid name clashes.

Also I renamed the .pri file to avoid confusion.

Change-Id: I88203ce9dbfddc8d734e5e232ff71bc0e244e5b8
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

50 files changed, 156 insertions, 156 deletions

diff --git a/src/plugins/qmldesigner/designercore/designercore.pri b/src/plugins/qmldesigner/designercore/designercore-lib.pri
index 54bc62961c..56e3a8a2bd 100644
--- a/src/plugins/qmldesigner/designercore/designercore.pri
+++ b/src/plugins/qmldesigner/designercore/designercore-lib.pri
@@ -5,6 +5,7 @@ QT += script \
     network
 
 DEFINES += TEST_EXPORTS
+DEFINES += DESIGNER_CORE_LIBRARY
 INCLUDEPATH += $$PWD \
     $$PWD/include
 
@@ -76,7 +77,7 @@ SOURCES += $$PWD/model/abstractview.cpp \
     $$PWD/model/modelmerger.cpp \
     $$PWD/exceptions/rewritingexception.cpp
 
-HEADERS += $$PWD/include/corelib_global.h \
+HEADERS += $$PWD/include/qmldesignercorelib_global.h \
     $$PWD/include/abstractview.h \
     $$PWD/include/nodeinstanceview.h \
     $$PWD/include/rewriterview.h \
diff --git a/src/plugins/qmldesigner/designercore/include/abstractproperty.h b/src/plugins/qmldesigner/designercore/include/abstractproperty.h
index 925ea92736..8c38613564 100644
--- a/src/plugins/qmldesigner/designercore/include/abstractproperty.h
+++ b/src/plugins/qmldesigner/designercore/include/abstractproperty.h
@@ -33,7 +33,7 @@
 #include <QVariant>
 #include <QWeakPointer>
 #include <QSharedPointer>
-#include "corelib_global.h"
+#include "qmldesignercorelib_global.h"
 
 QT_BEGIN_NAMESPACE
 class QTextStream;
@@ -52,11 +52,11 @@ namespace QmlDesigner {
 class Model;
 class ModelNode;
 class AbstractView;
-class CORESHARED_EXPORT VariantProperty;
-class CORESHARED_EXPORT NodeListProperty;
-class CORESHARED_EXPORT NodeAbstractProperty;
-class CORESHARED_EXPORT BindingProperty;
-class CORESHARED_EXPORT NodeProperty;
+class QMLDESIGNERCORE_EXPORT VariantProperty;
+class QMLDESIGNERCORE_EXPORT NodeListProperty;
+class QMLDESIGNERCORE_EXPORT NodeAbstractProperty;
+class QMLDESIGNERCORE_EXPORT BindingProperty;
+class QMLDESIGNERCORE_EXPORT NodeProperty;
 class QmlObjectNode;
 
 
@@ -65,14 +65,14 @@ namespace Internal {
     class ModelPrivate;
 }
 
-class CORESHARED_EXPORT AbstractProperty
+class QMLDESIGNERCORE_EXPORT AbstractProperty
 {
     friend class QmlDesigner::ModelNode;
     friend class QmlDesigner::Internal::ModelPrivate;
 
-    friend CORESHARED_EXPORT bool operator ==(const AbstractProperty &property1, const AbstractProperty &property2);
-    friend CORESHARED_EXPORT bool operator !=(const AbstractProperty &property1, const AbstractProperty &property2);
-    friend CORESHARED_EXPORT uint qHash(const AbstractProperty& property);
+    friend QMLDESIGNERCORE_EXPORT bool operator ==(const AbstractProperty &property1, const AbstractProperty &property2);
+    friend QMLDESIGNERCORE_EXPORT bool operator !=(const AbstractProperty &property1, const AbstractProperty &property2);
+    friend QMLDESIGNERCORE_EXPORT uint qHash(const AbstractProperty& property);
 
 public:
     AbstractProperty();
@@ -117,11 +117,11 @@ private:
     QWeakPointer<AbstractView> m_view;
 };
 
-CORESHARED_EXPORT bool operator ==(const AbstractProperty &property1, const AbstractProperty &property2);
-CORESHARED_EXPORT bool operator !=(const AbstractProperty &property1, const AbstractProperty &property2);
-CORESHARED_EXPORT uint qHash(const AbstractProperty& property);
-CORESHARED_EXPORT QTextStream& operator<<(QTextStream &stream, const AbstractProperty &property);
-CORESHARED_EXPORT QDebug operator<<(QDebug debug, const AbstractProperty &AbstractProperty);
+QMLDESIGNERCORE_EXPORT bool operator ==(const AbstractProperty &property1, const AbstractProperty &property2);
+QMLDESIGNERCORE_EXPORT bool operator !=(const AbstractProperty &property1, const AbstractProperty &property2);
+QMLDESIGNERCORE_EXPORT uint qHash(const AbstractProperty& property);
+QMLDESIGNERCORE_EXPORT QTextStream& operator<<(QTextStream &stream, const AbstractProperty &property);
+QMLDESIGNERCORE_EXPORT QDebug operator<<(QDebug debug, const AbstractProperty &AbstractProperty);
 }
 
 #endif //ABSTRACTPROPERTY_H
diff --git a/src/plugins/qmldesigner/designercore/include/abstractview.h b/src/plugins/qmldesigner/designercore/include/abstractview.h
index 5acd62499f..5b45b1a1b2 100644
--- a/src/plugins/qmldesigner/designercore/include/abstractview.h
+++ b/src/plugins/qmldesigner/designercore/include/abstractview.h
@@ -30,7 +30,7 @@
 #ifndef ABSTRACTVIEW_H
 #define ABSTRACTVIEW_H
 
-#include <corelib_global.h>
+#include <qmldesignercorelib_global.h>
 
 #include <model.h>
 #include <modelnode.h>
@@ -58,7 +58,7 @@ class QmlModelView;
 class NodeInstanceView;
 class RewriterView;
 
-class CORESHARED_EXPORT AbstractView : public QObject
+class QMLDESIGNERCORE_EXPORT AbstractView : public QObject
 {
     Q_OBJECT
 public:
@@ -191,8 +191,8 @@ private:
     QWeakPointer<Model> m_model;
 };
 
-CORESHARED_EXPORT QList<Internal::InternalNodePointer> toInternalNodeList(const QList<ModelNode> &nodeList);
-CORESHARED_EXPORT QList<ModelNode> toModelNodeList(const QList<Internal::InternalNodePointer> &nodeList, AbstractView *view);
+QMLDESIGNERCORE_EXPORT QList<Internal::InternalNodePointer> toInternalNodeList(const QList<ModelNode> &nodeList);
+QMLDESIGNERCORE_EXPORT QList<ModelNode> toModelNodeList(const QList<Internal::InternalNodePointer> &nodeList, AbstractView *view);
 
 }
 
diff --git a/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h b/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h
index 6595183356..01866b32d3 100644
--- a/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h
+++ b/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h
@@ -31,7 +31,7 @@
 #ifndef BASETEXTEDITMODIFIER_H
 #define BASETEXTEDITMODIFIER_H
 
-#include "corelib_global.h"
+#include "qmldesignercorelib_global.h"
 #include "plaintexteditmodifier.h"
 
 #include <texteditor/basetexteditor.h>
@@ -44,7 +44,7 @@ class Snapshot;
 
 namespace QmlDesigner {
 
-class CORESHARED_EXPORT BaseTextEditModifier: public PlainTextEditModifier
+class QMLDESIGNERCORE_EXPORT BaseTextEditModifier: public PlainTextEditModifier
 {
 public:
     BaseTextEditModifier(TextEditor::BaseTextEditorWidget *textEdit);
diff --git a/src/plugins/qmldesigner/designercore/include/bindingproperty.h b/src/plugins/qmldesigner/designercore/include/bindingproperty.h
index be6ea0b3fa..43f2e64890 100644
--- a/src/plugins/qmldesigner/designercore/include/bindingproperty.h
+++ b/src/plugins/qmldesigner/designercore/include/bindingproperty.h
@@ -30,12 +30,12 @@
 #ifndef BINDINGPROPERTY_H
 #define BINDINGPROPERTY_H
 
-#include "corelib_global.h"
+#include "qmldesignercorelib_global.h"
 #include "abstractproperty.h"
 
 namespace QmlDesigner {
 
-class CORESHARED_EXPORT BindingProperty : public QmlDesigner::AbstractProperty
+class QMLDESIGNERCORE_EXPORT BindingProperty : public QmlDesigner::AbstractProperty
 {
     friend class QmlDesigner::ModelNode;
     friend class QmlDesigner::Internal::ModelPrivate;
diff --git a/src/plugins/qmldesigner/designercore/include/exception.h b/src/plugins/qmldesigner/designercore/include/exception.h
index d2efe6a856..87f8d75d57 100644
--- a/src/plugins/qmldesigner/designercore/include/exception.h
+++ b/src/plugins/qmldesigner/designercore/include/exception.h
@@ -30,14 +30,14 @@
 #ifndef EXCEPTION_H
 #define EXCEPTION_H
 
-#include <corelib_global.h>
+#include <qmldesignercorelib_global.h>
 
 #include <QString>
 #include <QDebug>
 
 namespace QmlDesigner {
 
-class CORESHARED_EXPORT Exception
+class QMLDESIGNERCORE_EXPORT Exception
 {
 public:
     Exception(int line,
@@ -64,7 +64,7 @@ private:
     static bool s_shouldAssert;
 };
 
-CORESHARED_EXPORT QDebug operator<<(QDebug debug, const Exception &exception);
+QMLDESIGNERCORE_EXPORT QDebug operator<<(QDebug debug, const Exception &exception);
 
 }
 
diff --git a/src/plugins/qmldesigner/designercore/include/import.h b/src/plugins/qmldesigner/designercore/include/import.h
index 6e5b167ba9..5c2807aa2b 100644
--- a/src/plugins/qmldesigner/designercore/include/import.h
+++ b/src/plugins/qmldesigner/designercore/include/import.h
@@ -33,11 +33,11 @@
 #include <QString>
 #include <QStringList>
 
-#include "corelib_global.h"
+#include "qmldesignercorelib_global.h"
 
 namespace QmlDesigner {
 
-class CORESHARED_EXPORT Import
+class QMLDESIGNERCORE_EXPORT Import
 {
 public:
     static Import createLibraryImport(const QString &url, const QString &version = QString(), const QString &alias = QString(), const QStringList &importPaths = QStringList());
@@ -71,7 +71,7 @@ private:
     QStringList m_importPathList;
 };
 
-CORESHARED_EXPORT uint qHash(const Import &import);
+QMLDESIGNERCORE_EXPORT uint qHash(const Import &import);
 
 } // namespace QmlDesigner
 
diff --git a/src/plugins/qmldesigner/designercore/include/invalidargumentexception.h b/src/plugins/qmldesigner/designercore/include/invalidargumentexception.h
index a6ddb3437b..fc28d15a3c 100644
--- a/src/plugins/qmldesigner/designercore/include/invalidargumentexception.h
+++ b/src/plugins/qmldesigner/designercore/include/invalidargumentexception.h
@@ -35,7 +35,7 @@
 
 namespace QmlDesigner {
 
-class CORESHARED_EXPORT InvalidArgumentException : public Exception
+class QMLDESIGNERCORE_EXPORT InvalidArgumentException : public Exception
 {
 public:
     InvalidArgumentException(int line,
diff --git a/src/plugins/qmldesigner/designercore/include/invalididexception.h b/src/plugins/qmldesigner/designercore/include/invalididexception.h
index d3b2dce3ab..8e5be36130 100644
--- a/src/plugins/qmldesigner/designercore/include/invalididexception.h
+++ b/src/plugins/qmldesigner/designercore/include/invalididexception.h
@@ -34,7 +34,7 @@
 
 namespace QmlDesigner {
 
-class CORESHARED_EXPORT InvalidIdException : public InvalidArgumentException
+class QMLDESIGNERCORE_EXPORT InvalidIdException : public InvalidArgumentException
 {
 public:
     enum Reason { InvalidCharacters, DuplicateId };
diff --git a/src/plugins/qmldesigner/designercore/include/invalidmetainfoexception.h b/src/plugins/qmldesigner/designercore/include/invalidmetainfoexception.h
index 7737f724fb..1d3e646c01 100644
--- a/src/plugins/qmldesigner/designercore/include/invalidmetainfoexception.h
+++ b/src/plugins/qmldesigner/designercore/include/invalidmetainfoexception.h
@@ -34,7 +34,7 @@
 
 namespace QmlDesigner {
 
-class CORESHARED_EXPORT InvalidMetaInfoException : public Exception
+class QMLDESIGNERCORE_EXPORT InvalidMetaInfoException : public Exception
 {
 public:
     InvalidMetaInfoException(int line,
diff --git a/src/plugins/qmldesigner/designercore/include/invalidmodelnodeexception.h b/src/plugins/qmldesigner/designercore/include/invalidmodelnodeexception.h
index e20b32219e..34c856e7ea 100644
--- a/src/plugins/qmldesigner/designercore/include/invalidmodelnodeexception.h
+++ b/src/plugins/qmldesigner/designercore/include/invalidmodelnodeexception.h
@@ -34,7 +34,7 @@
 
 namespace QmlDesigner {
 
-class CORESHARED_EXPORT InvalidModelNodeException : public Exception
+class QMLDESIGNERCORE_EXPORT InvalidModelNodeException : public Exception
 {
 public:
     InvalidModelNodeException(int line,
diff --git a/src/plugins/qmldesigner/designercore/include/invalidmodelstateexception.h b/src/plugins/qmldesigner/designercore/include/invalidmodelstateexception.h
index 07977d49c9..c19c1b4eea 100644
--- a/src/plugins/qmldesigner/designercore/include/invalidmodelstateexception.h
+++ b/src/plugins/qmldesigner/designercore/include/invalidmodelstateexception.h
@@ -34,7 +34,7 @@
 
 namespace QmlDesigner {
 
-class CORESHARED_EXPORT InvalidModelStateException : public Exception
+class QMLDESIGNERCORE_EXPORT InvalidModelStateException : public Exception
 {
 public:
     InvalidModelStateException(int line,
diff --git a/src/plugins/qmldesigner/designercore/include/invalidpropertyexception.h b/src/plugins/qmldesigner/designercore/include/invalidpropertyexception.h
index ecafa191e2..e04febdfb0 100644
--- a/src/plugins/qmldesigner/designercore/include/invalidpropertyexception.h
+++ b/src/plugins/qmldesigner/designercore/include/invalidpropertyexception.h
@@ -34,7 +34,7 @@
 
 namespace QmlDesigner {
 
-class CORESHARED_EXPORT InvalidPropertyException : public Exception
+class QMLDESIGNERCORE_EXPORT InvalidPropertyException : public Exception
 {
 public:
     InvalidPropertyException(int line,
diff --git a/src/plugins/qmldesigner/designercore/include/invalidqmlsourceexception.h b/src/plugins/qmldesigner/designercore/include/invalidqmlsourceexception.h
index 1eb2f665f6..e1ed1b3ac0 100644
--- a/src/plugins/qmldesigner/designercore/include/invalidqmlsourceexception.h
+++ b/src/plugins/qmldesigner/designercore/include/invalidqmlsourceexception.h
@@ -34,7 +34,7 @@
 
 namespace QmlDesigner {
 
-class CORESHARED_EXPORT InvalidQmlSourceException : public QmlDesigner::Exception
+class QMLDESIGNERCORE_EXPORT InvalidQmlSourceException : public QmlDesigner::Exception
 {
 public:
     InvalidQmlSourceException(int line,
diff --git a/src/plugins/qmldesigner/designercore/include/invalidreparentingexception.h b/src/plugins/qmldesigner/designercore/include/invalidreparentingexception.h
index 867d1b3a35..b01ac78528 100644
--- a/src/plugins/qmldesigner/designercore/include/invalidreparentingexception.h
+++ b/src/plugins/qmldesigner/designercore/include/invalidreparentingexception.h
@@ -34,7 +34,7 @@
 
 namespace QmlDesigner {
 
-class CORESHARED_EXPORT InvalidReparentingException : public Exception
+class QMLDESIGNERCORE_EXPORT InvalidReparentingException : public Exception
 {
 public:
     InvalidReparentingException(int line,
diff --git a/src/plugins/qmldesigner/designercore/include/invalidslideindexexception.h b/src/plugins/qmldesigner/designercore/include/invalidslideindexexception.h
index 76168009c9..42a1ead7bc 100644
--- a/src/plugins/qmldesigner/designercore/include/invalidslideindexexception.h
+++ b/src/plugins/qmldesigner/designercore/include/invalidslideindexexception.h
@@ -34,7 +34,7 @@
 
 namespace QmlDesigner {
 
-class CORESHARED_EXPORT InvalidSlideIndexException : public Exception
+class QMLDESIGNERCORE_EXPORT InvalidSlideIndexException : public Exception
 {
 public:
     InvalidSlideIndexException(int line,
diff --git a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
index c9aa09c998..37820f8d57 100644
--- a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
+++ b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
@@ -30,7 +30,7 @@
 #ifndef ITEMLIBRARYINFO_H
 #define ITEMLIBRARYINFO_H
 
-#include "corelib_global.h"
+#include "qmldesignercorelib_global.h"
 
 #include "propertycontainer.h"
 #include <QSharedPointer>
@@ -45,15 +45,15 @@ class MetaInfoPrivate;
 
 class ItemLibraryEntry;
 
-CORESHARED_EXPORT QDataStream& operator<<(QDataStream& stream, const ItemLibraryEntry &itemLibraryEntry);
-CORESHARED_EXPORT QDataStream& operator>>(QDataStream& stream, ItemLibraryEntry &itemLibraryEntry);
+QMLDESIGNERCORE_EXPORT QDataStream& operator<<(QDataStream& stream, const ItemLibraryEntry &itemLibraryEntry);
+QMLDESIGNERCORE_EXPORT QDataStream& operator>>(QDataStream& stream, ItemLibraryEntry &itemLibraryEntry);
 
-class CORESHARED_EXPORT ItemLibraryEntry
+class QMLDESIGNERCORE_EXPORT ItemLibraryEntry
 {
     //friend class QmlDesigner::MetaInfo;
     //friend class QmlDesigner::Internal::MetaInfoParser;
-    friend CORESHARED_EXPORT QDataStream& operator<<(QDataStream& stream, const ItemLibraryEntry &itemLibraryEntry);
-    friend CORESHARED_EXPORT QDataStream& operator>>(QDataStream& stream, ItemLibraryEntry &itemLibraryEntry);
+    friend QMLDESIGNERCORE_EXPORT QDataStream& operator<<(QDataStream& stream, const ItemLibraryEntry &itemLibraryEntry);
+    friend QMLDESIGNERCORE_EXPORT QDataStream& operator>>(QDataStream& stream, ItemLibraryEntry &itemLibraryEntry);
 
 public:
     ItemLibraryEntry();
@@ -93,7 +93,7 @@ private:
     QExplicitlySharedDataPointer<Internal::ItemLibraryEntryData> m_data;
 };
 
-class CORESHARED_EXPORT ItemLibraryInfo : public QObject
+class QMLDESIGNERCORE_EXPORT ItemLibraryInfo : public QObject
 {
     Q_OBJECT
 
diff --git a/src/plugins/qmldesigner/designercore/include/metainfo.h b/src/plugins/qmldesigner/designercore/include/metainfo.h
index e1f97a547a..f267ff6fe2 100644
--- a/src/plugins/qmldesigner/designercore/include/metainfo.h
+++ b/src/plugins/qmldesigner/designercore/include/metainfo.h
@@ -30,7 +30,7 @@
 #ifndef METAINFO_H
 #define METAINFO_H
 
-#include "corelib_global.h"
+#include "qmldesignercorelib_global.h"
 
 #include <QMultiHash>
 #include <QString>
@@ -53,11 +53,11 @@ namespace Internal {
     typedef QSharedPointer<MetaInfoPrivate> MetaInfoPrivatePointer;
 }
 
-CORESHARED_EXPORT bool operator==(const MetaInfo &first, const MetaInfo &second);
-CORESHARED_EXPORT bool operator!=(const MetaInfo &first, const MetaInfo &second);
+QMLDESIGNERCORE_EXPORT bool operator==(const MetaInfo &first, const MetaInfo &second);
+QMLDESIGNERCORE_EXPORT bool operator!=(const MetaInfo &first, const MetaInfo &second);
 
 
-class CORESHARED_EXPORT MetaInfo
+class QMLDESIGNERCORE_EXPORT MetaInfo
 {
     friend class QmlDesigner::Internal::MetaInfoPrivate;
     friend class QmlDesigner::Internal::ModelPrivate;
diff --git a/src/plugins/qmldesigner/designercore/include/metainfoparser.h b/src/plugins/qmldesigner/designercore/include/metainfoparser.h
index f58db3963a..2a7141175b 100644
--- a/src/plugins/qmldesigner/designercore/include/metainfoparser.h
+++ b/src/plugins/qmldesigner/designercore/include/metainfoparser.h
@@ -30,7 +30,7 @@
 #ifndef METAINFOPARSER_H
 #define METAINFOPARSER_H
 
-#include "corelib_global.h"
+#include "qmldesignercorelib_global.h"
 #include <QXmlStreamReader>
 #include <QString>
 #include <QFile>
@@ -43,7 +43,7 @@ class ItemLibraryEntry;
 namespace Internal {
 
 
-class TEST_CORESHARED_EXPORT MetaInfoParser
+class QMLDESIGNERCORE_EXPORT MetaInfoParser
 {
 public:
     MetaInfoParser(const MetaInfo &metaInfo);
diff --git a/src/plugins/qmldesigner/designercore/include/model.h b/src/plugins/qmldesigner/designercore/include/model.h
index 9ea7c6f9f5..9fe307eb13 100644
--- a/src/plugins/qmldesigner/designercore/include/model.h
+++ b/src/plugins/qmldesigner/designercore/include/model.h
@@ -30,7 +30,7 @@
 #ifndef DESIGNERMODEL_H
 #define DESIGNERMODEL_H
 
-#include <corelib_global.h>
+#include <qmldesignercorelib_global.h>
 #include <QObject>
 #include <QMimeData>
 #include <QPair>
@@ -62,7 +62,7 @@ class RewriterView;
 
 typedef QList<QPair<QString, QVariant> > PropertyListType;
 
-class CORESHARED_EXPORT Model : public QObject
+class QMLDESIGNERCORE_EXPORT Model : public QObject
 {
     friend class QmlDesigner::ModelNode;
     friend class QmlDesigner::NodeState;
diff --git a/src/plugins/qmldesigner/designercore/include/modelnode.h b/src/plugins/qmldesigner/designercore/include/modelnode.h
index ebf5e5124e..b494e2f708 100644
--- a/src/plugins/qmldesigner/designercore/include/modelnode.h
+++ b/src/plugins/qmldesigner/designercore/include/modelnode.h
@@ -30,7 +30,7 @@
 #ifndef DESIGNERNODE_H
 #define DESIGNERNODE_H
 
-#include "corelib_global.h"
+#include "qmldesignercorelib_global.h"
 #include <QWeakPointer>
 #include <QList>
 #include <QMetaType>
@@ -63,18 +63,18 @@ class NodeProperty;
 class NodeAbstractProperty;
 class ModelNode;
 
-CORESHARED_EXPORT QList<Internal::InternalNodePointer> toInternalNodeList(const QList<ModelNode> &nodeList);
+QMLDESIGNERCORE_EXPORT QList<Internal::InternalNodePointer> toInternalNodeList(const QList<ModelNode> &nodeList);
 
 typedef QList<QPair<QString, QVariant> > PropertyListType;
 
-class CORESHARED_EXPORT  ModelNode
+class QMLDESIGNERCORE_EXPORT  ModelNode
 {
-    friend CORESHARED_EXPORT bool operator ==(const ModelNode &firstNode, const ModelNode &secondNode);
-    friend CORESHARED_EXPORT bool operator !=(const ModelNode &firstNode, const ModelNode &secondNode);
-    friend CORESHARED_EXPORT uint qHash(const ModelNode & node);
-    friend CORESHARED_EXPORT QDebug operator<<(QDebug debug, const ModelNode &modelNode);
-    friend CORESHARED_EXPORT bool operator <(const ModelNode &firstNode, const ModelNode &secondNode);
-    friend CORESHARED_EXPORT QList<Internal::InternalNodePointer> toInternalNodeList(const QList<ModelNode> &nodeList);
+    friend QMLDESIGNERCORE_EXPORT bool operator ==(const ModelNode &firstNode, const ModelNode &secondNode);
+    friend QMLDESIGNERCORE_EXPORT bool operator !=(const ModelNode &firstNode, const ModelNode &secondNode);
+    friend QMLDESIGNERCORE_EXPORT uint qHash(const ModelNode & node);
+    friend QMLDESIGNERCORE_EXPORT QDebug operator<<(QDebug debug, const ModelNode &modelNode);
+    friend QMLDESIGNERCORE_EXPORT bool operator <(const ModelNode &firstNode, const ModelNode &secondNode);
+    friend QMLDESIGNERCORE_EXPORT QList<Internal::InternalNodePointer> toInternalNodeList(const QList<ModelNode> &nodeList);
     friend class QmlDesigner::Model;
     friend class QmlDesigner::AbstractView;
     friend class QmlDesigner::NodeListProperty;
@@ -192,12 +192,12 @@ private: // variables
     QWeakPointer<AbstractView> m_view;
 };
 
-CORESHARED_EXPORT bool operator ==(const ModelNode &firstNode, const ModelNode &secondNode);
-CORESHARED_EXPORT bool operator !=(const ModelNode &firstNode, const ModelNode &secondNode);
-CORESHARED_EXPORT uint qHash(const ModelNode & node);
-CORESHARED_EXPORT bool operator <(const ModelNode &firstNode, const ModelNode &secondNode);
-CORESHARED_EXPORT QDebug operator<<(QDebug debug, const ModelNode &modelNode);
-CORESHARED_EXPORT QTextStream& operator<<(QTextStream &stream, const ModelNode &modelNode);
+QMLDESIGNERCORE_EXPORT bool operator ==(const ModelNode &firstNode, const ModelNode &secondNode);
+QMLDESIGNERCORE_EXPORT bool operator !=(const ModelNode &firstNode, const ModelNode &secondNode);
+QMLDESIGNERCORE_EXPORT uint qHash(const ModelNode & node);
+QMLDESIGNERCORE_EXPORT bool operator <(const ModelNode &firstNode, const ModelNode &secondNode);
+QMLDESIGNERCORE_EXPORT QDebug operator<<(QDebug debug, const ModelNode &modelNode);
+QMLDESIGNERCORE_EXPORT QTextStream& operator<<(QTextStream &stream, const ModelNode &modelNode);
 }
 
 Q_DECLARE_METATYPE(QmlDesigner::ModelNode)
diff --git a/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h b/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h
index 9493b6001d..78f52a4d52 100644
--- a/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h
+++ b/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h
@@ -45,9 +45,9 @@ class NodeAbstractProperty : public AbstractProperty
     friend class QmlDesigner::Internal::ModelPrivate;
     friend class QmlDesigner::AbstractProperty;
 
-    friend CORESHARED_EXPORT bool operator ==(const NodeAbstractProperty &property1, const NodeAbstractProperty &property2);
-    friend CORESHARED_EXPORT bool operator !=(const NodeAbstractProperty &property1, const NodeAbstractProperty &property2);
-    friend CORESHARED_EXPORT uint qHash(const NodeAbstractProperty& property);
+    friend QMLDESIGNERCORE_EXPORT bool operator ==(const NodeAbstractProperty &property1, const NodeAbstractProperty &property2);
+    friend QMLDESIGNERCORE_EXPORT bool operator !=(const NodeAbstractProperty &property1, const NodeAbstractProperty &property2);
+    friend QMLDESIGNERCORE_EXPORT uint qHash(const NodeAbstractProperty& property);
 
 public:
     NodeAbstractProperty();
@@ -66,11 +66,11 @@ protected:
 };
 
 
-CORESHARED_EXPORT bool operator ==(const NodeAbstractProperty &property1, const NodeAbstractProperty &property2);
-CORESHARED_EXPORT bool operator !=(const NodeAbstractProperty &property1, const NodeAbstractProperty &property2);
-CORESHARED_EXPORT uint qHash(const NodeAbstractProperty& property);
-CORESHARED_EXPORT QTextStream& operator<<(QTextStream &stream, const NodeAbstractProperty &property);
-CORESHARED_EXPORT QDebug operator<<(QDebug debug, const NodeAbstractProperty &property);
+QMLDESIGNERCORE_EXPORT bool operator ==(const NodeAbstractProperty &property1, const NodeAbstractProperty &property2);
+QMLDESIGNERCORE_EXPORT bool operator !=(const NodeAbstractProperty &property1, const NodeAbstractProperty &property2);
+QMLDESIGNERCORE_EXPORT uint qHash(const NodeAbstractProperty& property);
+QMLDESIGNERCORE_EXPORT QTextStream& operator<<(QTextStream &stream, const NodeAbstractProperty &property);
+QMLDESIGNERCORE_EXPORT QDebug operator<<(QDebug debug, const NodeAbstractProperty &property);
 
 } // namespace QmlDesigner
 
diff --git a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
index 1dd1550190..2be9671a98 100644
--- a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
+++ b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
@@ -30,7 +30,7 @@
 #ifndef NODEINSTANCEVIEW_H
 #define NODEINSTANCEVIEW_H
 
-#include "corelib_global.h"
+#include "qmldesignercorelib_global.h"
 #include "abstractview.h"
 
 #include <modelnode.h>
@@ -69,7 +69,7 @@ class CompleteComponentCommand;
 class InformationContainer;
 class TokenCommand;
 
-class CORESHARED_EXPORT NodeInstanceView : public AbstractView, public NodeInstanceClientInterface
+class QMLDESIGNERCORE_EXPORT NodeInstanceView : public AbstractView, public NodeInstanceClientInterface
 {
     Q_OBJECT
 
diff --git a/src/plugins/qmldesigner/designercore/include/nodelistproperty.h b/src/plugins/qmldesigner/designercore/include/nodelistproperty.h
index 25980a51d5..258ec5f73e 100644
--- a/src/plugins/qmldesigner/designercore/include/nodelistproperty.h
+++ b/src/plugins/qmldesigner/designercore/include/nodelistproperty.h
@@ -31,7 +31,7 @@
 #define NODELISTPROPERTY_H
 
 
-#include "corelib_global.h"
+#include "qmldesignercorelib_global.h"
 #include "nodeabstractproperty.h"
 #include <QList>
 
@@ -45,7 +45,7 @@ namespace Internal {
 }
 
 
-class CORESHARED_EXPORT NodeListProperty : public NodeAbstractProperty
+class QMLDESIGNERCORE_EXPORT NodeListProperty : public NodeAbstractProperty
 {
     friend class QmlDesigner::ModelNode;
     friend class QmlDesigner::AbstractProperty;
diff --git a/src/plugins/qmldesigner/designercore/include/nodemetainfo.h b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h
index e596c59673..94cae8b386 100644
--- a/src/plugins/qmldesigner/designercore/include/nodemetainfo.h
+++ b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h
@@ -35,7 +35,7 @@
 #include <QExplicitlySharedDataPointer>
 #include <QIcon>
 
-#include "corelib_global.h"
+#include "qmldesignercorelib_global.h"
 #include "invalidmetainfoexception.h"
 
 QT_BEGIN_NAMESPACE
@@ -56,7 +56,7 @@ namespace Internal {
     class NodeMetaInfoPrivate;
 }
 
-class CORESHARED_EXPORT NodeMetaInfo
+class QMLDESIGNERCORE_EXPORT NodeMetaInfo
 {
 public:
     NodeMetaInfo();
diff --git a/src/plugins/qmldesigner/designercore/include/nodeproperty.h b/src/plugins/qmldesigner/designercore/include/nodeproperty.h
index fac2594b46..86aef86e0c 100644
--- a/src/plugins/qmldesigner/designercore/include/nodeproperty.h
+++ b/src/plugins/qmldesigner/designercore/include/nodeproperty.h
@@ -30,7 +30,7 @@
 #ifndef NODEPROPERTY_H
 #define NODEPROPERTY_H
 
-#include "corelib_global.h"
+#include "qmldesignercorelib_global.h"
 #include "nodeabstractproperty.h"
 
 namespace QmlDesigner {
@@ -39,7 +39,7 @@ namespace Internal {
     class ModelPrivate;
 }
 
-class CORESHARED_EXPORT NodeProperty : public NodeAbstractProperty
+class QMLDESIGNERCORE_EXPORT NodeProperty : public NodeAbstractProperty
 {
     friend class QmlDesigner::ModelNode;
     friend class QmlDesigner::Internal::ModelPrivate;
diff --git a/src/plugins/qmldesigner/designercore/include/notimplementedexception.h b/src/plugins/qmldesigner/designercore/include/notimplementedexception.h
index 80e0319473..301e92c768 100644
--- a/src/plugins/qmldesigner/designercore/include/notimplementedexception.h
+++ b/src/plugins/qmldesigner/designercore/include/notimplementedexception.h
@@ -34,7 +34,7 @@
 
 namespace QmlDesigner {
 
-class CORESHARED_EXPORT NotImplementedException : public Exception
+class QMLDESIGNERCORE_EXPORT NotImplementedException : public Exception
 {
 public:
     NotImplementedException(int line,
diff --git a/src/plugins/qmldesigner/designercore/include/plaintexteditmodifier.h b/src/plugins/qmldesigner/designercore/include/plaintexteditmodifier.h
index 362ccfe8d3..ad79a1a64f 100644
--- a/src/plugins/qmldesigner/designercore/include/plaintexteditmodifier.h
+++ b/src/plugins/qmldesigner/designercore/include/plaintexteditmodifier.h
@@ -30,7 +30,7 @@
 #ifndef PLAINTEXTEDITMODIFIER_H
 #define PLAINTEXTEDITMODIFIER_H
 
-#include "corelib_global.h"
+#include "qmldesignercorelib_global.h"
 #include "textmodifier.h"
 
 QT_BEGIN_NAMESPACE
@@ -44,7 +44,7 @@ namespace Utils {
 
 namespace QmlDesigner {
 
-class CORESHARED_EXPORT PlainTextEditModifier: public TextModifier
+class QMLDESIGNERCORE_EXPORT PlainTextEditModifier: public TextModifier
 {
     Q_OBJECT
 
@@ -98,7 +98,7 @@ private:
     bool m_ongoingTextChange;
 };
 
-class CORESHARED_EXPORT NotIndentingTextEditModifier: public PlainTextEditModifier
+class QMLDESIGNERCORE_EXPORT NotIndentingTextEditModifier: public PlainTextEditModifier
 {
 public:
     NotIndentingTextEditModifier(QPlainTextEdit *textEdit)
diff --git a/src/plugins/qmldesigner/designercore/include/propertycontainer.h b/src/plugins/qmldesigner/designercore/include/propertycontainer.h
index 411ea5d190..e0c5be4292 100644
--- a/src/plugins/qmldesigner/designercore/include/propertycontainer.h
+++ b/src/plugins/qmldesigner/designercore/include/propertycontainer.h
@@ -30,7 +30,7 @@
 #ifndef PROPERTYCONTAINER_H
 #define PROPERTYCONTAINER_H
 
-#include "corelib_global.h"
+#include "qmldesignercorelib_global.h"
 
 #include <QString>
 #include <QExplicitlySharedDataPointer>
@@ -41,13 +41,13 @@ namespace QmlDesigner {
 
 class PropertyContainer;
 
-CORESHARED_EXPORT QDataStream &operator<<(QDataStream &stream, const PropertyContainer &propertyContainer);
-CORESHARED_EXPORT QDataStream &operator>>(QDataStream &stream, PropertyContainer &propertyContainer);
+QMLDESIGNERCORE_EXPORT QDataStream &operator<<(QDataStream &stream, const PropertyContainer &propertyContainer);
+QMLDESIGNERCORE_EXPORT QDataStream &operator>>(QDataStream &stream, PropertyContainer &propertyContainer);
 
-class CORESHARED_EXPORT PropertyContainer
+class QMLDESIGNERCORE_EXPORT PropertyContainer
 {
-    friend CORESHARED_EXPORT QDataStream &operator<<(QDataStream &stream, const PropertyContainer &propertyContainer);
-    friend CORESHARED_EXPORT QDataStream &operator>>(QDataStream &stream, PropertyContainer &propertyContainer);
+    friend QMLDESIGNERCORE_EXPORT QDataStream &operator<<(QDataStream &stream, const PropertyContainer &propertyContainer);
+    friend QMLDESIGNERCORE_EXPORT QDataStream &operator>>(QDataStream &stream, PropertyContainer &propertyContainer);
 
 public:
     PropertyContainer();
@@ -70,8 +70,8 @@ private:
     mutable QVariant m_value;
 };
 
-CORESHARED_EXPORT QDataStream &operator<<(QDataStream &stream, const QList<PropertyContainer> &propertyContainerList);
-CORESHARED_EXPORT QDataStream &operator>>(QDataStream &stream, QList<PropertyContainer> &propertyContainerList);
+QMLDESIGNERCORE_EXPORT QDataStream &operator<<(QDataStream &stream, const QList<PropertyContainer> &propertyContainerList);
+QMLDESIGNERCORE_EXPORT QDataStream &operator>>(QDataStream &stream, QList<PropertyContainer> &propertyContainerList);
 
 } //namespace QmlDesigner
 
diff --git a/src/plugins/qmldesigner/designercore/include/propertynode.h b/src/plugins/qmldesigner/designercore/include/propertynode.h
index 62eaac1f21..4c5b674fa3 100644
--- a/src/plugins/qmldesigner/designercore/include/propertynode.h
+++ b/src/plugins/qmldesigner/designercore/include/propertynode.h
@@ -30,11 +30,11 @@
 #ifndef PROPERTYNODE_H
 #define PROPERTYNODE_H
 
-#include "corelib_global.h"
+#include "qmldesignercorelib_global.h"
 
 namespace QmlDesigner {
 
-class CORESHARED_EXPORT PropertyNode // : public BaseModelNode
+class QMLDESIGNERCORE_EXPORT PropertyNode // : public BaseModelNode
 {
 public:
     PropertyNode();
diff --git a/src/plugins/qmldesigner/designercore/include/qmlanchors.h b/src/plugins/qmldesigner/designercore/include/qmlanchors.h
index 3b30ee8abb..63b784f707 100644
--- a/src/plugins/qmldesigner/designercore/include/qmlanchors.h
+++ b/src/plugins/qmldesigner/designercore/include/qmlanchors.h
@@ -30,13 +30,13 @@
 #ifndef QmlAnchors_H
 #define QmlAnchors_H
 
-#include <corelib_global.h>
+#include <qmldesignercorelib_global.h>
 #include <qmlitemnode.h>
 
 
 namespace QmlDesigner {
 
-class CORESHARED_EXPORT AnchorLine
+class QMLDESIGNERCORE_EXPORT AnchorLine
 {
 public:
     enum Type {
@@ -73,7 +73,7 @@ private:
 };
 
 
-class CORESHARED_EXPORT QmlAnchors
+class QMLDESIGNERCORE_EXPORT QmlAnchors
 {
 public:
     QmlAnchors(const QmlItemNode &fxItemNode);
diff --git a/src/plugins/qmldesigner/designercore/include/qmlchangeset.h b/src/plugins/qmldesigner/designercore/include/qmlchangeset.h
index ff29b5083e..82dde2866d 100644
--- a/src/plugins/qmldesigner/designercore/include/qmlchangeset.h
+++ b/src/plugins/qmldesigner/designercore/include/qmlchangeset.h
@@ -30,13 +30,13 @@
 #ifndef QMLCHANGESET_H
 #define QMLCHANGESET_H
 
-#include <corelib_global.h>
+#include <qmldesignercorelib_global.h>
 #include <modelnode.h>
 #include "qmlmodelnodefacade.h"
 
 namespace QmlDesigner {
 
-class  CORESHARED_EXPORT QmlModelStateOperation : public QmlModelNodeFacade
+class  QMLDESIGNERCORE_EXPORT QmlModelStateOperation : public QmlModelNodeFacade
 {
 public:
     QmlModelStateOperation() : QmlModelNodeFacade() {}
@@ -47,7 +47,7 @@ public:
 };
 
 
-class  CORESHARED_EXPORT QmlPropertyChanges : public QmlModelStateOperation
+class  QMLDESIGNERCORE_EXPORT QmlPropertyChanges : public QmlModelStateOperation
 {
 public:
     QmlPropertyChanges() : QmlModelStateOperation() {}
diff --git a/src/plugins/qmldesigner/designercore/include/corelib_global.h b/src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h
index 0d63fc559e..444db0cf89 100644
--- a/src/plugins/qmldesigner/designercore/include/corelib_global.h
+++ b/src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h
@@ -32,15 +32,14 @@
 
 // Unnecessary since core isn't a dll any more.
 
-#define CORESHARED_EXPORT
 #define TEST_CORESHARED_EXPORT
 
-//#if defined(CORE_LIBRARY)
-//#  define CORESHARED_EXPORT Q_DECL_EXPORT
-//#else
-//#  define CORESHARED_EXPORT Q_DECL_IMPORT
-//#endif
-//
+#if defined(DESIGNER_CORE_LIBRARY)
+#  define QMLDESIGNERCORE_EXPORT Q_DECL_EXPORT
+#else
+#  define QMLDESIGNERCORE_EXPORT Q_DECL_IMPORT
+#endif
+
 //#if defined(TEST_EXPORTS)
 //#if defined(CORE_LIBRARY)
 //#  define TEST_CORESHARED_EXPORT Q_DECL_EXPORT
diff --git a/src/plugins/qmldesigner/designercore/include/qmlitemnode.h b/src/plugins/qmldesigner/designercore/include/qmlitemnode.h
index 53532f1e03..a8a3537230 100644
--- a/src/plugins/qmldesigner/designercore/include/qmlitemnode.h
+++ b/src/plugins/qmldesigner/designercore/include/qmlitemnode.h
@@ -30,7 +30,7 @@
 #ifndef QmlItemNode_H
 #define QmlItemNode_H
 
-#include <corelib_global.h>
+#include <qmldesignercorelib_global.h>
 #include <modelnode.h>
 #include "qmlobjectnode.h"
 #include "qmlstate.h"
@@ -44,9 +44,9 @@ namespace QmlDesigner {
 class QmlModelStateGroup;
 class QmlAnchors;
 
-class CORESHARED_EXPORT QmlItemNode : public QmlObjectNode
+class QMLDESIGNERCORE_EXPORT QmlItemNode : public QmlObjectNode
 {
-    friend class CORESHARED_EXPORT QmlAnchors;
+    friend class QMLDESIGNERCORE_EXPORT QmlAnchors;
 public:
     QmlItemNode() : QmlObjectNode() {}
     QmlItemNode(const ModelNode &modelNode)  : QmlObjectNode(modelNode) {}
@@ -97,9 +97,9 @@ public:
     bool hasAnySubModelNodes() const;
 };
 
-CORESHARED_EXPORT uint qHash(const QmlItemNode &node);
+QMLDESIGNERCORE_EXPORT uint qHash(const QmlItemNode &node);
 
-class CORESHARED_EXPORT QmlModelStateGroup
+class QMLDESIGNERCORE_EXPORT QmlModelStateGroup
 {
     friend class QmlItemNode;
     friend class QmlModelView;
@@ -122,8 +122,8 @@ private:
     ModelNode m_modelNode;
 };
 
-CORESHARED_EXPORT QList<ModelNode> toModelNodeList(const QList<QmlItemNode> &fxItemNodeList);
-CORESHARED_EXPORT QList<QmlItemNode> toQmlItemNodeList(const QList<ModelNode> &modelNodeList);
+QMLDESIGNERCORE_EXPORT QList<ModelNode> toModelNodeList(const QList<QmlItemNode> &fxItemNodeList);
+QMLDESIGNERCORE_EXPORT QList<QmlItemNode> toQmlItemNodeList(const QList<ModelNode> &modelNodeList);
 
 } //QmlDesigner
 
diff --git a/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h b/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h
index 817aad0947..8e8c875f20 100644
--- a/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h
+++ b/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h
@@ -30,14 +30,14 @@
 #ifndef FXMODELNODEFACADE_H
 #define FXMODELNODEFACADE_H
 
-#include <corelib_global.h>
+#include <qmldesignercorelib_global.h>
 #include <modelnode.h>
 
 namespace QmlDesigner {
 
 class QmlModelView;
 
-class CORESHARED_EXPORT QmlModelNodeFacade
+class QMLDESIGNERCORE_EXPORT QmlModelNodeFacade
 {
 public:
     operator ModelNode() const { return m_modelNode; }
diff --git a/src/plugins/qmldesigner/designercore/include/qmlmodelview.h b/src/plugins/qmldesigner/designercore/include/qmlmodelview.h
index 5350cb58df..f8c093dc36 100644
--- a/src/plugins/qmldesigner/designercore/include/qmlmodelview.h
+++ b/src/plugins/qmldesigner/designercore/include/qmlmodelview.h
@@ -30,7 +30,7 @@
 #ifndef QMLMODELVIEW_H
 #define QMLMODELVIEW_H
 
-#include <corelib_global.h>
+#include <qmldesignercorelib_global.h>
 #include <QPoint>
 #include <abstractview.h>
 #include "qmlitemnode.h"
@@ -42,11 +42,11 @@ namespace QmlDesigner {
 
 class ItemLibraryEntry;
 
-class CORESHARED_EXPORT QmlModelView : public AbstractView
+class QMLDESIGNERCORE_EXPORT QmlModelView : public AbstractView
 {
     Q_OBJECT
-    friend CORESHARED_EXPORT class QmlObjectNode;
-    friend CORESHARED_EXPORT class QmlModelNodeFacade;
+    friend QMLDESIGNERCORE_EXPORT class QmlObjectNode;
+    friend QMLDESIGNERCORE_EXPORT class QmlModelNodeFacade;
 
 public:
     QmlModelView(QObject *parent) ;
diff --git a/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h b/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h
index fc17a0c3f5..b5339fe1c7 100644
--- a/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h
+++ b/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h
@@ -30,7 +30,7 @@
 #ifndef FXOBJECTNODE_H
 #define FXOBJECTNODE_H
 
-#include <corelib_global.h>
+#include <qmldesignercorelib_global.h>
 #include "qmlmodelnodefacade.h"
 #include "qmlstate.h"
 #include "qmlchangeset.h"
@@ -42,7 +42,7 @@ namespace QmlDesigner {
 class QmlItemNode;
 class QmlPropertyChanges;
 
-class CORESHARED_EXPORT QmlObjectNode : public QmlModelNodeFacade
+class QMLDESIGNERCORE_EXPORT QmlObjectNode : public QmlModelNodeFacade
 {
 public:
     QmlObjectNode() : QmlModelNodeFacade() {}
@@ -106,9 +106,9 @@ protected:
     QList<QmlModelState> allDefinedStates() const;
 };
 
-CORESHARED_EXPORT uint qHash(const QmlObjectNode &node);
-CORESHARED_EXPORT QList<ModelNode> toModelNodeList(const QList<QmlObjectNode> &fxObjectNodeList);
-CORESHARED_EXPORT QList<QmlObjectNode> toQmlObjectNodeList(const QList<ModelNode> &modelNodeList);
+QMLDESIGNERCORE_EXPORT uint qHash(const QmlObjectNode &node);
+QMLDESIGNERCORE_EXPORT QList<ModelNode> toModelNodeList(const QList<QmlObjectNode> &fxObjectNodeList);
+QMLDESIGNERCORE_EXPORT QList<QmlObjectNode> toQmlObjectNodeList(const QList<ModelNode> &modelNodeList);
 }// QmlDesigner
 
 #endif // FXOBJECTNODE_H
diff --git a/src/plugins/qmldesigner/designercore/include/qmlstate.h b/src/plugins/qmldesigner/designercore/include/qmlstate.h
index d21ee6572d..f87a4aec01 100644
--- a/src/plugins/qmldesigner/designercore/include/qmlstate.h
+++ b/src/plugins/qmldesigner/designercore/include/qmlstate.h
@@ -30,7 +30,7 @@
 #ifndef FXSTATE_H
 #define FXSTATE_H
 
-#include <corelib_global.h>
+#include <qmldesignercorelib_global.h>
 #include "qmlmodelnodefacade.h"
 #include "qmlchangeset.h"
 
@@ -40,9 +40,9 @@ class QmlModelView;
 class QmlModelStateGroup;
 class QmlObjectNode;
 
-class CORESHARED_EXPORT QmlModelState : public QmlModelNodeFacade
+class QMLDESIGNERCORE_EXPORT QmlModelState : public QmlModelNodeFacade
 {
-    friend class CORESHARED_EXPORT QmlModelView;
+    friend class QMLDESIGNERCORE_EXPORT QmlModelView;
 
 public:
     QmlModelState();
diff --git a/src/plugins/qmldesigner/designercore/include/removebasestateexception.h b/src/plugins/qmldesigner/designercore/include/removebasestateexception.h
index f058dd368f..695d24d7d2 100644
--- a/src/plugins/qmldesigner/designercore/include/removebasestateexception.h
+++ b/src/plugins/qmldesigner/designercore/include/removebasestateexception.h
@@ -34,7 +34,7 @@
 
 namespace QmlDesigner {
 
-class CORESHARED_EXPORT RemoveBaseStateException : public Exception
+class QMLDESIGNERCORE_EXPORT RemoveBaseStateException : public Exception
 {
 public:
     RemoveBaseStateException(int line,
diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h
index f8c2b7e70b..f8c0d9b942 100644
--- a/src/plugins/qmldesigner/designercore/include/rewriterview.h
+++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h
@@ -30,7 +30,7 @@
 #ifndef REWRITERVIEW_H
 #define REWRITERVIEW_H
 
-#include "corelib_global.h"
+#include "qmldesignercorelib_global.h"
 #include "abstractview.h"
 #include "exception.h"
 #include <modelnodepositionstorage.h>
@@ -55,7 +55,7 @@ class ScopeChain;
 
 namespace QmlDesigner {
 
-class CORESHARED_EXPORT TextModifier;
+class QMLDESIGNERCORE_EXPORT TextModifier;
 
 namespace Internal {
 
@@ -65,7 +65,7 @@ class ModelNodePositionStorage;
 
 } //Internal
 
-class CORESHARED_EXPORT RewriterView : public AbstractView
+class QMLDESIGNERCORE_EXPORT RewriterView : public AbstractView
 {
     Q_OBJECT
 
diff --git a/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h b/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h
index 9528c2ee9f..58ef809068 100644
--- a/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h
+++ b/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h
@@ -30,7 +30,7 @@
 #ifndef SUBCOMPONENTMANAGER_H
 #define SUBCOMPONENTMANAGER_H
 
-#include "corelib_global.h"
+#include "qmldesignercorelib_global.h"
 
 #include <import.h>
 
@@ -45,7 +45,7 @@ namespace QmlDesigner {
 
 class Model;
 
-class CORESHARED_EXPORT SubComponentManager : public QObject
+class QMLDESIGNERCORE_EXPORT SubComponentManager : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/plugins/qmldesigner/designercore/include/textmodifier.h b/src/plugins/qmldesigner/designercore/include/textmodifier.h
index 764e46de1a..a00276db50 100644
--- a/src/plugins/qmldesigner/designercore/include/textmodifier.h
+++ b/src/plugins/qmldesigner/designercore/include/textmodifier.h
@@ -30,7 +30,7 @@
 #ifndef TEXTMODIFIER_H
 #define TEXTMODIFIER_H
 
-#include "corelib_global.h"
+#include "qmldesignercorelib_global.h"
 
 #include <qmljs/qmljsdocument.h>
 
@@ -41,7 +41,7 @@
 
 namespace QmlDesigner {
 
-class CORESHARED_EXPORT TextModifier: public QObject
+class QMLDESIGNERCORE_EXPORT TextModifier: public QObject
 {
     Q_OBJECT
 
diff --git a/src/plugins/qmldesigner/designercore/include/variantproperty.h b/src/plugins/qmldesigner/designercore/include/variantproperty.h
index be0aa95ab2..c4aa37a9a5 100644
--- a/src/plugins/qmldesigner/designercore/include/variantproperty.h
+++ b/src/plugins/qmldesigner/designercore/include/variantproperty.h
@@ -30,7 +30,7 @@
 #ifndef VARIANTROPERTY_H
 #define VARIANTROPERTY_H
 
-#include "corelib_global.h"
+#include "qmldesignercorelib_global.h"
 #include "abstractproperty.h"
 
 QT_BEGIN_NAMESPACE
@@ -45,7 +45,7 @@ namespace Internal {
     class ModelPrivate;
 }
 
-class CORESHARED_EXPORT VariantProperty : public AbstractProperty
+class QMLDESIGNERCORE_EXPORT VariantProperty : public AbstractProperty
 {
     friend class QmlDesigner::ModelNode;
     friend class QmlDesigner::Internal::ModelPrivate;
@@ -65,8 +65,8 @@ protected:
     VariantProperty(const QString &propertyName, const Internal::InternalNodePointer &internalNode, Model* model, AbstractView *view);
 };
 
-CORESHARED_EXPORT QTextStream& operator<<(QTextStream &stream, const VariantProperty &property);
-CORESHARED_EXPORT QDebug operator<<(QDebug debug, const VariantProperty &VariantProperty);
+QMLDESIGNERCORE_EXPORT QTextStream& operator<<(QTextStream &stream, const VariantProperty &property);
+QMLDESIGNERCORE_EXPORT QDebug operator<<(QDebug debug, const VariantProperty &VariantProperty);
 
 }
 
diff --git a/src/plugins/qmldesigner/designercore/include/widgetqueryview.h b/src/plugins/qmldesigner/designercore/include/widgetqueryview.h
index 8421e6e2bd..37cff597d8 100644
--- a/src/plugins/qmldesigner/designercore/include/widgetqueryview.h
+++ b/src/plugins/qmldesigner/designercore/include/widgetqueryview.h
@@ -30,7 +30,7 @@
 #ifndef WIDGETQUERYVIEW_H
 #define WIDGETQUERYVIEW_H
 
-#include "corelib_global.h"
+#include "qmldesignercorelib_global.h"
 #include "nodeinstanceview.h"
 #include "propertycontainer.h"
 #include <QHash>
@@ -41,7 +41,7 @@
 
 namespace QmlDesigner {
 
-class CORESHARED_EXPORT WidgetQueryView : public NodeInstanceView
+class WidgetQueryView : public NodeInstanceView
 {
     Q_OBJECT
 public:
diff --git a/src/plugins/qmldesigner/designercore/model/internalnode.cpp b/src/plugins/qmldesigner/designercore/model/internalnode.cpp
index bd37949aef..74323c351a 100644
--- a/src/plugins/qmldesigner/designercore/model/internalnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/internalnode.cpp
@@ -36,7 +36,7 @@
 #include "invalidpropertyexception.h"
 
 #include <QDebug>
-#include <corelib_global.h>
+#include <qmldesignercorelib_global.h>
 
 namespace QmlDesigner {
 namespace Internal {
diff --git a/src/plugins/qmldesigner/designercore/model/internalproperty.h b/src/plugins/qmldesigner/designercore/model/internalproperty.h
index e6a6e2002a..8fe2203ce3 100644
--- a/src/plugins/qmldesigner/designercore/model/internalproperty.h
+++ b/src/plugins/qmldesigner/designercore/model/internalproperty.h
@@ -30,7 +30,7 @@
 #ifndef INTERNALPROPERTY_H
 #define INTERNALPROPERTY_H
 
-#include "corelib_global.h"
+#include "qmldesignercorelib_global.h"
 
 #include <QVariant>
 #include <QString>
@@ -55,7 +55,7 @@ class InternalNode;
 typedef QSharedPointer<InternalNode> InternalNodePointer;
 typedef QWeakPointer<InternalNode> InternalNodeWeakPointer;
 
-class CORESHARED_EXPORT InternalProperty
+class QMLDESIGNERCORE_EXPORT InternalProperty
 {
 public:
     typedef QSharedPointer<InternalProperty> Pointer;
diff --git a/src/plugins/qmldesigner/designercore/model/model_p.h b/src/plugins/qmldesigner/designercore/model/model_p.h
index 5a563cb205..b1cfcdc0c8 100644
--- a/src/plugins/qmldesigner/designercore/model/model_p.h
+++ b/src/plugins/qmldesigner/designercore/model/model_p.h
@@ -39,7 +39,7 @@
 #include "abstractview.h"
 #include "metainfo.h"
 
-#include "corelib_global.h"
+#include "qmldesignercorelib_global.h"
 
 QT_BEGIN_NAMESPACE
 class QPlainTextEdit;
diff --git a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h
index 0ced918c99..1460462857 100644
--- a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h
+++ b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h
@@ -30,7 +30,7 @@
 #ifndef MODELTOTEXTMERGER_H
 #define MODELTOTEXTMERGER_H
 
-#include "corelib_global.h"
+#include "qmldesignercorelib_global.h"
 #include <modelnode.h>
 #include "abstractview.h"
 #include "nodeabstractproperty.h"
@@ -46,7 +46,7 @@
 
 namespace QmlDesigner {
 
-class CORESHARED_EXPORT RewriterView;
+class QMLDESIGNERCORE_EXPORT RewriterView;
 
 namespace Internal {
 
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h
index 1de76d88a6..a166d40c6b 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h
@@ -30,7 +30,7 @@
 #ifndef TEXTTOMODELMERGER_H
 #define TEXTTOMODELMERGER_H
 
-#include "corelib_global.h"
+#include "qmldesignercorelib_global.h"
 #include "import.h"
 #include "nodelistproperty.h"
 #include "modelnode.h"
@@ -43,7 +43,7 @@
 
 namespace QmlDesigner {
 
-class CORESHARED_EXPORT RewriterView;
+class QMLDESIGNERCORE_EXPORT RewriterView;
 
 namespace Internal {
 
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.pro b/src/plugins/qmldesigner/qmldesignerplugin.pro
index dee55d0678..6935895dcc 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.pro
+++ b/src/plugins/qmldesigner/qmldesignerplugin.pro
@@ -9,7 +9,7 @@ include(../../qtcreatorplugin.pri)
 include(../../private_headers.pri)
 include(qmldesigner_dependencies.pri)
 
-include(designercore/designercore.pri)
+include(designercore/designercore-lib.pri)
 include(components/componentcore/componentcore.pri)
 include(components/integration/integration.pri)
 include(components/propertyeditor/propertyeditor.pri)