feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: export core functionality

Browse Source 
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>
This commit is contained in:
Thomas Hartmann
2012-11-06 14:30:12 +01:00
parent 960801b52c
commit 5e243dabd9
51 changed files with 157 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/qmldesigner/designercore/designercore.pri → src/plugins/qmldesigner/designercore/designercore-lib.pri
+2 -1
View File
@@ -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 \
src/plugins/qmldesigner/designercore/include/abstractproperty.h
+15 -15
View File
@@ -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
src/plugins/qmldesigner/designercore/include/abstractview.h
+4 -4
View File
@@ -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);
}
src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h
+2 -2
View File
@@ -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);
src/plugins/qmldesigner/designercore/include/bindingproperty.h
+2 -2
View File
@@ -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;
src/plugins/qmldesigner/designercore/include/exception.h
+3 -3
View File
@@ -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);
}
src/plugins/qmldesigner/designercore/include/import.h
+3 -3
View File
@@ -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
src/plugins/qmldesigner/designercore/include/invalidargumentexception.h
+1 -1
View File
@@ -35,7 +35,7 @@
namespace QmlDesigner {
class CORESHARED_EXPORT InvalidArgumentException : public Exception
class QMLDESIGNERCORE_EXPORT InvalidArgumentException : public Exception
{
public:
InvalidArgumentException(int line,
src/plugins/qmldesigner/designercore/include/invalididexception.h
+1 -1
View File
@@ -34,7 +34,7 @@
namespace QmlDesigner {
class CORESHARED_EXPORT InvalidIdException : public InvalidArgumentException
class QMLDESIGNERCORE_EXPORT InvalidIdException : public InvalidArgumentException
{
public:
enum Reason { InvalidCharacters, DuplicateId };
src/plugins/qmldesigner/designercore/include/invalidmetainfoexception.h
+1 -1
View File
@@ -34,7 +34,7 @@
namespace QmlDesigner {
class CORESHARED_EXPORT InvalidMetaInfoException : public Exception
class QMLDESIGNERCORE_EXPORT InvalidMetaInfoException : public Exception
{
public:
InvalidMetaInfoException(int line,
src/plugins/qmldesigner/designercore/include/invalidmodelnodeexception.h
+1 -1
View File
@@ -34,7 +34,7 @@
namespace QmlDesigner {
class CORESHARED_EXPORT InvalidModelNodeException : public Exception
class QMLDESIGNERCORE_EXPORT InvalidModelNodeException : public Exception
{
public:
InvalidModelNodeException(int line,
src/plugins/qmldesigner/designercore/include/invalidmodelstateexception.h
+1 -1
View File
@@ -34,7 +34,7 @@
namespace QmlDesigner {
class CORESHARED_EXPORT InvalidModelStateException : public Exception
class QMLDESIGNERCORE_EXPORT InvalidModelStateException : public Exception
{
public:
InvalidModelStateException(int line,
src/plugins/qmldesigner/designercore/include/invalidpropertyexception.h
+1 -1
View File
@@ -34,7 +34,7 @@
namespace QmlDesigner {
class CORESHARED_EXPORT InvalidPropertyException : public Exception
class QMLDESIGNERCORE_EXPORT InvalidPropertyException : public Exception
{
public:
InvalidPropertyException(int line,
src/plugins/qmldesigner/designercore/include/invalidqmlsourceexception.h
+1 -1
View File
@@ -34,7 +34,7 @@
namespace QmlDesigner {
class CORESHARED_EXPORT InvalidQmlSourceException : public QmlDesigner::Exception
class QMLDESIGNERCORE_EXPORT InvalidQmlSourceException : public QmlDesigner::Exception
{
public:
InvalidQmlSourceException(int line,
src/plugins/qmldesigner/designercore/include/invalidreparentingexception.h
+1 -1
View File
@@ -34,7 +34,7 @@
namespace QmlDesigner {
class CORESHARED_EXPORT InvalidReparentingException : public Exception
class QMLDESIGNERCORE_EXPORT InvalidReparentingException : public Exception
{
public:
InvalidReparentingException(int line,
src/plugins/qmldesigner/designercore/include/invalidslideindexexception.h
+1 -1
View File
@@ -34,7 +34,7 @@
namespace QmlDesigner {
class CORESHARED_EXPORT InvalidSlideIndexException : public Exception
class QMLDESIGNERCORE_EXPORT InvalidSlideIndexException : public Exception
{
public:
InvalidSlideIndexException(int line,
src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
+7 -7
View File
@@ -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
src/plugins/qmldesigner/designercore/include/metainfo.h
+4 -4
View File
@@ -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;
src/plugins/qmldesigner/designercore/include/metainfoparser.h
+2 -2
View File
@@ -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);
src/plugins/qmldesigner/designercore/include/model.h
+2 -2
View File
@@ -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;
src/plugins/qmldesigner/designercore/include/modelnode.h
+15 -15
View File
@@ -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)
src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h
+8 -8
View File
@@ -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
src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
+2 -2
View File
@@ -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
src/plugins/qmldesigner/designercore/include/nodelistproperty.h
+2 -2
View File
@@ -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;
src/plugins/qmldesigner/designercore/include/nodemetainfo.h
+2 -2
View File
@@ -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();
src/plugins/qmldesigner/designercore/include/nodeproperty.h
+2 -2
View File
@@ -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;
src/plugins/qmldesigner/designercore/include/notimplementedexception.h
+1 -1
View File
@@ -34,7 +34,7 @@
namespace QmlDesigner {
class CORESHARED_EXPORT NotImplementedException : public Exception
class QMLDESIGNERCORE_EXPORT NotImplementedException : public Exception
{
public:
NotImplementedException(int line,
src/plugins/qmldesigner/designercore/include/plaintexteditmodifier.h
+3 -3
View File
@@ -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)
src/plugins/qmldesigner/designercore/include/propertycontainer.h
+8 -8
View File
@@ -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
src/plugins/qmldesigner/designercore/include/propertynode.h
+2 -2
View File
@@ -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();
src/plugins/qmldesigner/designercore/include/qmlanchors.h
+3 -3
View File
@@ -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);
src/plugins/qmldesigner/designercore/include/qmlchangeset.h
+3 -3
View File
@@ -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() {}
src/plugins/qmldesigner/designercore/include/corelib_global.h → src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h
+6 -7
View File
@@ -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
src/plugins/qmldesigner/designercore/include/qmlitemnode.h
+7 -7
View File
@@ -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
src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h
+2 -2
View File
@@ -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; }
src/plugins/qmldesigner/designercore/include/qmlmodelview.h
+4 -4
View File
@@ -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) ;
src/plugins/qmldesigner/designercore/include/qmlobjectnode.h
+5 -5
View File
@@ -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
src/plugins/qmldesigner/designercore/include/qmlstate.h
+3 -3
View File
@@ -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();
src/plugins/qmldesigner/designercore/include/removebasestateexception.h
+1 -1
View File
@@ -34,7 +34,7 @@
namespace QmlDesigner {
class CORESHARED_EXPORT RemoveBaseStateException : public Exception
class QMLDESIGNERCORE_EXPORT RemoveBaseStateException : public Exception
{
public:
RemoveBaseStateException(int line,
src/plugins/qmldesigner/designercore/include/rewriterview.h
+3 -3
View File
@@ -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
src/plugins/qmldesigner/designercore/include/subcomponentmanager.h
+2 -2
View File
@@ -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:
src/plugins/qmldesigner/designercore/include/textmodifier.h
+2 -2
View File
@@ -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
src/plugins/qmldesigner/designercore/include/variantproperty.h
+4 -4
View File
@@ -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);
}
src/plugins/qmldesigner/designercore/include/widgetqueryview.h
+2 -2
View File
@@ -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:
src/plugins/qmldesigner/designercore/model/internalnode.cpp
+1 -1
View File
@@ -36,7 +36,7 @@
#include "invalidpropertyexception.h"
#include <QDebug>
#include <corelib_global.h>
#include <qmldesignercorelib_global.h>
namespace QmlDesigner {
namespace Internal {
src/plugins/qmldesigner/designercore/model/internalproperty.h
+2 -2
View File
@@ -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;
src/plugins/qmldesigner/designercore/model/model_p.h
+1 -1
View File
@@ -39,7 +39,7 @@
#include "abstractview.h"
#include "metainfo.h"
#include "corelib_global.h"
#include "qmldesignercorelib_global.h"
QT_BEGIN_NAMESPACE
class QPlainTextEdit;
src/plugins/qmldesigner/designercore/model/modeltotextmerger.h
+2 -2
View File
@@ -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 {
src/plugins/qmldesigner/designercore/model/texttomodelmerger.h
+2 -2
View File
@@ -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 {
src/plugins/qmldesigner/qmldesignerplugin.pro
+1 -1
View File
@@ -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)
tests/auto/qml/qmldesigner/coretests/coretests.pro
+1 -1
View File
@@ -25,7 +25,7 @@ INCLUDEPATH += $$IDE_SOURCE_TREE//share/qtcreator/qml/qmlpuppet
INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner
include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/designercore.pri)
include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/designercore-lib.pri)
include($$IDE_SOURCE_TREE/src/plugins/qmljstools/qmljstools.pri)
include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs.pri)