diff options
Diffstat (limited to 'src/declarative/qml')
34 files changed, 103 insertions, 103 deletions
diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h index 5b3cc5b3..64bec11d 100644 --- a/src/declarative/qml/qdeclarative.h +++ b/src/declarative/qml/qdeclarative.h @@ -42,11 +42,11 @@ #ifndef QDECLARATIVE_H #define QDECLARATIVE_H -#include <QtQuick1/qdeclarativeprivate.h> -#include <QtQuick1/qdeclarativeparserstatus.h> -#include <QtQuick1/qdeclarativepropertyvaluesource.h> -#include <QtQuick1/qdeclarativepropertyvalueinterceptor.h> -#include <QtQuick1/qdeclarativelist.h> +#include <QtDeclarative/qdeclarativeprivate.h> +#include <QtDeclarative/qdeclarativeparserstatus.h> +#include <QtDeclarative/qdeclarativepropertyvaluesource.h> +#include <QtDeclarative/qdeclarativepropertyvalueinterceptor.h> +#include <QtDeclarative/qdeclarativelist.h> #include <QtCore/qbytearray.h> #include <QtCore/qmetaobject.h> @@ -392,11 +392,11 @@ int qmlRegisterCustomType(const char *uri, int versionMajor, int versionMinor, class QDeclarativeContext; class QDeclarativeEngine; -Q_QUICK1_EXPORT void qmlExecuteDeferred(QObject *); -Q_QUICK1_EXPORT QDeclarativeContext *qmlContext(const QObject *); -Q_QUICK1_EXPORT QDeclarativeEngine *qmlEngine(const QObject *); -Q_QUICK1_EXPORT QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true); -Q_QUICK1_EXPORT QObject *qmlAttachedPropertiesObject(int *, const QObject *, const QMetaObject *, bool create); +Q_DECLARATIVE_EXPORT void qmlExecuteDeferred(QObject *); +Q_DECLARATIVE_EXPORT QDeclarativeContext *qmlContext(const QObject *); +Q_DECLARATIVE_EXPORT QDeclarativeEngine *qmlEngine(const QObject *); +Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true); +Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObject(int *, const QObject *, const QMetaObject *, bool create); template<typename T> QObject *qmlAttachedPropertiesObject(const QObject *obj, bool create = true) diff --git a/src/declarative/qml/qdeclarativebinding_p.h b/src/declarative/qml/qdeclarativebinding_p.h index 88ac5ae0..ef64e536 100644 --- a/src/declarative/qml/qdeclarativebinding_p.h +++ b/src/declarative/qml/qdeclarativebinding_p.h @@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeAbstractBinding +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeAbstractBinding { public: typedef QWeakPointer<QDeclarativeAbstractBinding> Pointer; @@ -143,7 +143,7 @@ private: class QDeclarativeContext; class QDeclarativeBindingPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeBinding : public QDeclarativeExpression, public QDeclarativeAbstractBinding +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeBinding : public QDeclarativeExpression, public QDeclarativeAbstractBinding { Q_OBJECT public: diff --git a/src/declarative/qml/qdeclarativecompiledbindings.cpp b/src/declarative/qml/qdeclarativecompiledbindings.cpp index 768b8986..bbcb063d 100644 --- a/src/declarative/qml/qdeclarativecompiledbindings.cpp +++ b/src/declarative/qml/qdeclarativecompiledbindings.cpp @@ -44,7 +44,7 @@ #include "private/qdeclarativecompiledbindings_p.h" -#include <QtQuick1/qdeclarativeinfo.h> +#include <QtDeclarative/qdeclarativeinfo.h> #include <private/qdeclarativecontext_p.h> #include <private/qdeclarativejsast_p.h> #include <private/qdeclarativejsengine_p.h> diff --git a/src/declarative/qml/qdeclarativecomponent.h b/src/declarative/qml/qdeclarativecomponent.h index a2468370..3f69cb6d 100644 --- a/src/declarative/qml/qdeclarativecomponent.h +++ b/src/declarative/qml/qdeclarativecomponent.h @@ -42,8 +42,8 @@ #ifndef QDECLARATIVECOMPONENT_H #define QDECLARATIVECOMPONENT_H -#include <QtQuick1/qdeclarative.h> -#include <QtQuick1/qdeclarativeerror.h> +#include <QtDeclarative/qdeclarative.h> +#include <QtDeclarative/qdeclarativeerror.h> #include <QtCore/qobject.h> #include <QtCore/qstring.h> @@ -60,7 +60,7 @@ class QByteArray; class QDeclarativeComponentPrivate; class QDeclarativeEngine; class QDeclarativeComponentAttached; -class Q_QUICK1_EXPORT QDeclarativeComponent : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativeComponent : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeComponent) diff --git a/src/declarative/qml/qdeclarativecontext.h b/src/declarative/qml/qdeclarativecontext.h index 27a96ebc..d6eb5bb8 100644 --- a/src/declarative/qml/qdeclarativecontext.h +++ b/src/declarative/qml/qdeclarativecontext.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVECONTEXT_H #define QDECLARATIVECONTEXT_H -#include <QtQuick1/qtquick1global.h> +#include <QtDeclarative/qtdeclarativeglobal.h> #include <QtCore/qurl.h> #include <QtCore/qobject.h> #include <QtScript/qscriptvalue.h> @@ -62,7 +62,7 @@ class QDeclarativeContextPrivate; class QDeclarativeCompositeTypeData; class QDeclarativeContextData; -class Q_QUICK1_EXPORT QDeclarativeContext : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativeContext : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeContext) diff --git a/src/declarative/qml/qdeclarativecustomparser_p.h b/src/declarative/qml/qdeclarativecustomparser_p.h index de19520f..8d0103cb 100644 --- a/src/declarative/qml/qdeclarativecustomparser_p.h +++ b/src/declarative/qml/qdeclarativecustomparser_p.h @@ -70,7 +70,7 @@ QT_MODULE(Declarative) class QDeclarativeCompiler; class QDeclarativeCustomParserPropertyPrivate; -class Q_QUICK1_EXPORT QDeclarativeCustomParserProperty +class Q_DECLARATIVE_EXPORT QDeclarativeCustomParserProperty { public: QDeclarativeCustomParserProperty(); @@ -93,7 +93,7 @@ private: }; class QDeclarativeCustomParserNodePrivate; -class Q_QUICK1_EXPORT QDeclarativeCustomParserNode +class Q_DECLARATIVE_EXPORT QDeclarativeCustomParserNode { public: QDeclarativeCustomParserNode(); @@ -111,7 +111,7 @@ private: QDeclarativeCustomParserNodePrivate *d; }; -class Q_QUICK1_EXPORT QDeclarativeCustomParser +class Q_DECLARATIVE_EXPORT QDeclarativeCustomParser { public: enum Flag { diff --git a/src/declarative/qml/qdeclarativedom_p.h b/src/declarative/qml/qdeclarativedom_p.h index 02ec6319..95383d5e 100644 --- a/src/declarative/qml/qdeclarativedom_p.h +++ b/src/declarative/qml/qdeclarativedom_p.h @@ -58,7 +58,7 @@ #include <QtCore/qlist.h> #include <QtCore/qshareddata.h> -#include <private/qtquick1global_p.h> +#include <private/qtdeclarativeglobal_p.h> QT_BEGIN_HEADER @@ -78,7 +78,7 @@ class QIODevice; class QDeclarativeDomDocumentPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomDocument +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomDocument { public: QDeclarativeDomDocument(); @@ -98,7 +98,7 @@ private: }; class QDeclarativeDomPropertyPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomProperty +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomProperty { public: QDeclarativeDomProperty(); @@ -125,7 +125,7 @@ private: }; class QDeclarativeDomDynamicPropertyPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomDynamicProperty +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomDynamicProperty { public: QDeclarativeDomDynamicProperty(); @@ -153,7 +153,7 @@ private: }; class QDeclarativeDomObjectPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomObject { public: QDeclarativeDomObject(); @@ -198,7 +198,7 @@ private: class QDeclarativeDomValuePrivate; class QDeclarativeDomBasicValuePrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomValueLiteral +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomValueLiteral { public: QDeclarativeDomValueLiteral(); @@ -213,7 +213,7 @@ private: QSharedDataPointer<QDeclarativeDomBasicValuePrivate> d; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomValueBinding +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomValueBinding { public: QDeclarativeDomValueBinding(); @@ -228,7 +228,7 @@ private: QSharedDataPointer<QDeclarativeDomBasicValuePrivate> d; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomValueValueSource +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomValueValueSource { public: QDeclarativeDomValueValueSource(); @@ -243,7 +243,7 @@ private: QSharedDataPointer<QDeclarativeDomBasicValuePrivate> d; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomValueValueInterceptor +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomValueValueInterceptor { public: QDeclarativeDomValueValueInterceptor(); @@ -259,7 +259,7 @@ private: }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomComponent : public QDeclarativeDomObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomComponent : public QDeclarativeDomObject { public: QDeclarativeDomComponent(); @@ -270,7 +270,7 @@ public: QDeclarativeDomObject componentRoot() const; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomValue +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomValue { public: enum Type { @@ -314,7 +314,7 @@ private: QSharedDataPointer<QDeclarativeDomValuePrivate> d; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomList +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomList { public: QDeclarativeDomList(); @@ -335,7 +335,7 @@ private: }; class QDeclarativeDomImportPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomImport +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomImport { public: enum Type { Library, File }; diff --git a/src/declarative/qml/qdeclarativeengine.h b/src/declarative/qml/qdeclarativeengine.h index e7fe9ba6..2a803a58 100644 --- a/src/declarative/qml/qdeclarativeengine.h +++ b/src/declarative/qml/qdeclarativeengine.h @@ -46,8 +46,8 @@ #include <QtCore/qobject.h> #include <QtCore/qmap.h> #include <QtScript/qscriptvalue.h> -#include <QtQuick1/qdeclarativeerror.h> -#include <QtQuick1/qdeclarativedebug.h> +#include <QtDeclarative/qdeclarativeerror.h> +#include <QtDeclarative/qdeclarativedebug.h> QT_BEGIN_HEADER @@ -67,7 +67,7 @@ class QScriptContext; class QDeclarativeImageProvider; class QNetworkAccessManager; class QDeclarativeNetworkAccessManagerFactory; -class Q_QUICK1_EXPORT QDeclarativeEngine : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativeEngine : public QObject { Q_PROPERTY(QString offlineStoragePath READ offlineStoragePath WRITE setOfflineStoragePath) Q_OBJECT diff --git a/src/declarative/qml/qdeclarativeerror.h b/src/declarative/qml/qdeclarativeerror.h index a00a80af..ba74f9f3 100644 --- a/src/declarative/qml/qdeclarativeerror.h +++ b/src/declarative/qml/qdeclarativeerror.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEERROR_H #define QDECLARATIVEERROR_H -#include <QtQuick1/qtquick1global.h> +#include <QtDeclarative/qtdeclarativeglobal.h> #include <QtCore/qurl.h> #include <QtCore/qstring.h> @@ -54,7 +54,7 @@ QT_MODULE(Declarative) class QDebug; class QDeclarativeErrorPrivate; -class Q_QUICK1_EXPORT QDeclarativeError +class Q_DECLARATIVE_EXPORT QDeclarativeError { public: QDeclarativeError(); @@ -78,7 +78,7 @@ private: QDeclarativeErrorPrivate *d; }; -QDebug Q_QUICK1_EXPORT operator<<(QDebug debug, const QDeclarativeError &error); +QDebug Q_DECLARATIVE_EXPORT operator<<(QDebug debug, const QDeclarativeError &error); QT_END_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeexpression.h b/src/declarative/qml/qdeclarativeexpression.h index fa5c5dbd..f7dbc796 100644 --- a/src/declarative/qml/qdeclarativeexpression.h +++ b/src/declarative/qml/qdeclarativeexpression.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEEXPRESSION_H #define QDECLARATIVEEXPRESSION_H -#include <QtQuick1/qdeclarativeerror.h> +#include <QtDeclarative/qdeclarativeerror.h> #include <QtCore/qobject.h> #include <QtCore/qvariant.h> @@ -60,7 +60,7 @@ class QDeclarativeContext; class QDeclarativeExpressionPrivate; class QDeclarativeContextData; class QScriptValue; -class Q_QUICK1_EXPORT QDeclarativeExpression : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativeExpression : public QObject { Q_OBJECT public: diff --git a/src/declarative/qml/qdeclarativeextensioninterface.h b/src/declarative/qml/qdeclarativeextensioninterface.h index 91356a98..4655ea21 100644 --- a/src/declarative/qml/qdeclarativeextensioninterface.h +++ b/src/declarative/qml/qdeclarativeextensioninterface.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEEXTENSIONINTERFACE_H #define QDECLARATIVEEXTENSIONINTERFACE_H -#include <QtQuick1/qtquick1global.h> +#include <QtDeclarative/qtdeclarativeglobal.h> #include <QtCore/qobject.h> QT_BEGIN_HEADER @@ -53,7 +53,7 @@ QT_MODULE(Declarative) class QDeclarativeEngine; -struct Q_QUICK1_EXPORT QDeclarativeExtensionInterface +struct Q_DECLARATIVE_EXPORT QDeclarativeExtensionInterface { virtual ~QDeclarativeExtensionInterface() {} virtual void registerTypes(const char *uri) = 0; diff --git a/src/declarative/qml/qdeclarativeextensionplugin.h b/src/declarative/qml/qdeclarativeextensionplugin.h index 961685d5..fe914904 100644 --- a/src/declarative/qml/qdeclarativeextensionplugin.h +++ b/src/declarative/qml/qdeclarativeextensionplugin.h @@ -44,7 +44,7 @@ #include <QtCore/qplugin.h> -#include <QtQuick1/qdeclarativeextensioninterface.h> +#include <QtDeclarative/qdeclarativeextensioninterface.h> QT_BEGIN_HEADER @@ -54,7 +54,7 @@ QT_MODULE(Declarative) class QDeclarativeEngine; -class Q_QUICK1_EXPORT QDeclarativeExtensionPlugin : public QObject, public QDeclarativeExtensionInterface +class Q_DECLARATIVE_EXPORT QDeclarativeExtensionPlugin : public QObject, public QDeclarativeExtensionInterface { Q_OBJECT Q_INTERFACES(QDeclarativeExtensionInterface) diff --git a/src/declarative/qml/qdeclarativeimageprovider.h b/src/declarative/qml/qdeclarativeimageprovider.h index 1acf2de0..39f89535 100644 --- a/src/declarative/qml/qdeclarativeimageprovider.h +++ b/src/declarative/qml/qdeclarativeimageprovider.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEIMAGEPROVIDER_H #define QDECLARATIVEIMAGEPROVIDER_H -#include <QtQuick1/qtquick1global.h> +#include <QtDeclarative/qtdeclarativeglobal.h> #include <QtGui/qimage.h> #include <QtGui/qpixmap.h> @@ -54,7 +54,7 @@ QT_MODULE(Declarative) class QDeclarativeImageProviderPrivate; -class Q_QUICK1_EXPORT QDeclarativeImageProvider +class Q_DECLARATIVE_EXPORT QDeclarativeImageProvider { public: enum ImageType { diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp index 4d86a795..e51d2485 100644 --- a/src/declarative/qml/qdeclarativeimport.cpp +++ b/src/declarative/qml/qdeclarativeimport.cpp @@ -47,7 +47,7 @@ #include <QtCore/qpluginloader.h> #include <QtCore/qlibraryinfo.h> #include <QtCore/qalgorithms.h> -#include <QtQuick1/qdeclarativeextensioninterface.h> +#include <QtDeclarative/qdeclarativeextensioninterface.h> #include <private/qdeclarativeglobal_p.h> #include <private/qdeclarativetypenamecache_p.h> #include <private/qdeclarativeengine_p.h> @@ -708,7 +708,7 @@ QDeclarativeImportDatabase::QDeclarativeImportDatabase(QDeclarativeEngine *e) // Search order is applicationDirPath(), $QML_IMPORT_PATH, QLibraryInfo::ImportsPath - QString installImportsPath = QLibraryInfo::location(QLibraryInfo::ImportsPath) + QString::fromLatin1("/QtQuick1"); + QString installImportsPath = QLibraryInfo::location(QLibraryInfo::ImportsPath) + QString::fromLatin1("/QtDeclarative"); addImportPath(installImportsPath); diff --git a/src/declarative/qml/qdeclarativeinfo.h b/src/declarative/qml/qdeclarativeinfo.h index 5d37b6cb..58b97365 100644 --- a/src/declarative/qml/qdeclarativeinfo.h +++ b/src/declarative/qml/qdeclarativeinfo.h @@ -44,7 +44,7 @@ #include <QtCore/qdebug.h> #include <QtCore/qurl.h> -#include <QtQuick1/qdeclarativeerror.h> +#include <QtDeclarative/qdeclarativeerror.h> QT_BEGIN_HEADER @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeInfoPrivate; -class Q_QUICK1_EXPORT QDeclarativeInfo : public QDebug +class Q_DECLARATIVE_EXPORT QDeclarativeInfo : public QDebug { public: QDeclarativeInfo(const QDeclarativeInfo &); @@ -85,17 +85,17 @@ public: #endif private: - friend Q_QUICK1_EXPORT QDeclarativeInfo qmlInfo(const QObject *me); - friend Q_QUICK1_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error); - friend Q_QUICK1_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QList<QDeclarativeError> &errors); + friend Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me); + friend Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error); + friend Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QList<QDeclarativeError> &errors); QDeclarativeInfo(QDeclarativeInfoPrivate *); QDeclarativeInfoPrivate *d; }; -Q_QUICK1_EXPORT QDeclarativeInfo qmlInfo(const QObject *me); -Q_QUICK1_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error); -Q_QUICK1_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QList<QDeclarativeError> &errors); +Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me); +Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error); +Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QList<QDeclarativeError> &errors); QT_END_NAMESPACE diff --git a/src/declarative/qml/qdeclarativelist.h b/src/declarative/qml/qdeclarativelist.h index cfd284f2..39edc545 100644 --- a/src/declarative/qml/qdeclarativelist.h +++ b/src/declarative/qml/qdeclarativelist.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVELIST_H #define QDECLARATIVELIST_H -#include <QtQuick1/qtquick1global.h> +#include <QtDeclarative/qtdeclarativeglobal.h> #include <QtCore/qlist.h> #include <QtCore/qvariant.h> @@ -114,7 +114,7 @@ private: class QDeclarativeEngine; class QDeclarativeListReferencePrivate; -class Q_QUICK1_EXPORT QDeclarativeListReference +class Q_DECLARATIVE_EXPORT QDeclarativeListReference { public: QDeclarativeListReference(); diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp index 0c682021..9cbafb9a 100644 --- a/src/declarative/qml/qdeclarativemetatype.cpp +++ b/src/declarative/qml/qdeclarativemetatype.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtQuick1/qdeclarativeprivate.h> +#include <QtDeclarative/qdeclarativeprivate.h> #include "private/qdeclarativemetatype_p.h" #include "private/qdeclarativeproxymetaobject_p.h" diff --git a/src/declarative/qml/qdeclarativemetatype_p.h b/src/declarative/qml/qdeclarativemetatype_p.h index 8748f91a..5753b209 100644 --- a/src/declarative/qml/qdeclarativemetatype_p.h +++ b/src/declarative/qml/qdeclarativemetatype_p.h @@ -58,7 +58,7 @@ #include <QtCore/qglobal.h> #include <QtCore/qvariant.h> #include <QtCore/qbitarray.h> -#include <private/qtquick1global_p.h> +#include <private/qtdeclarativeglobal_p.h> QT_BEGIN_NAMESPACE @@ -66,7 +66,7 @@ class QDeclarativeType; class QDeclarativeCustomParser; class QDeclarativeTypePrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeMetaType +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeMetaType { public: static bool canCopy(int type); @@ -108,7 +108,7 @@ public: static QList<QDeclarativePrivate::AutoParentFunction> parentFunctions(); }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeType +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeType { public: QByteArray typeName() const; diff --git a/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h b/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h index 606159f5..12c62850 100644 --- a/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h +++ b/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVENETWORKACCESSMANAGERFACTORY_H #define QDECLARATIVENETWORKACCESSMANAGERFACTORY_H -#include <QtQuick1/qtquick1global.h> +#include <QtDeclarative/qtdeclarativeglobal.h> #include <QtCore/qobject.h> QT_BEGIN_HEADER @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QNetworkAccessManager; -class Q_QUICK1_EXPORT QDeclarativeNetworkAccessManagerFactory +class Q_DECLARATIVE_EXPORT QDeclarativeNetworkAccessManagerFactory { public: virtual ~QDeclarativeNetworkAccessManagerFactory(); diff --git a/src/declarative/qml/qdeclarativeparser_p.h b/src/declarative/qml/qdeclarativeparser_p.h index 676206c2..25d13a0e 100644 --- a/src/declarative/qml/qdeclarativeparser_p.h +++ b/src/declarative/qml/qdeclarativeparser_p.h @@ -237,7 +237,7 @@ namespace QDeclarativeParser QList<DynamicSlot> dynamicSlots; }; - class Q_QUICK1_EXPORT Variant + class Q_DECLARATIVE_EXPORT Variant { public: enum Type { diff --git a/src/declarative/qml/qdeclarativeparserstatus.h b/src/declarative/qml/qdeclarativeparserstatus.h index ffefe63f..9c646584 100644 --- a/src/declarative/qml/qdeclarativeparserstatus.h +++ b/src/declarative/qml/qdeclarativeparserstatus.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEPARSERSTATUS_H #define QDECLARATIVEPARSERSTATUS_H -#include <QtQuick1/qtquick1global.h> +#include <QtDeclarative/qtdeclarativeglobal.h> #include <QtCore/qobject.h> QT_BEGIN_HEADER @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class Q_QUICK1_EXPORT QDeclarativeParserStatus +class Q_DECLARATIVE_EXPORT QDeclarativeParserStatus { public: QDeclarativeParserStatus(); diff --git a/src/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h index a8d5308d..79e32779 100644 --- a/src/declarative/qml/qdeclarativeprivate.h +++ b/src/declarative/qml/qdeclarativeprivate.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtQuick1/qtquick1global.h> +#include <QtDeclarative/qtdeclarativeglobal.h> #include <QtCore/qvariant.h> QT_BEGIN_HEADER @@ -77,7 +77,7 @@ public: class QDeclarativeCustomParser; namespace QDeclarativePrivate { - void Q_QUICK1_EXPORT qdeclarativeelement_destructor(QObject *); + void Q_DECLARATIVE_EXPORT qdeclarativeelement_destructor(QObject *); template<typename T> class QDeclarativeElement : public T { @@ -239,7 +239,7 @@ namespace QDeclarativePrivate AutoParentRegistration = 2 }; - int Q_QUICK1_EXPORT qmlregister(RegistrationType, void *); + int Q_DECLARATIVE_EXPORT qmlregister(RegistrationType, void *); } QT_END_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeproperty.h b/src/declarative/qml/qdeclarativeproperty.h index c46afb45..e4f99021 100644 --- a/src/declarative/qml/qdeclarativeproperty.h +++ b/src/declarative/qml/qdeclarativeproperty.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEPROPERTY_H #define QDECLARATIVEPROPERTY_H -#include <QtQuick1/qtquick1global.h> +#include <QtDeclarative/qtdeclarativeglobal.h> #include <QtCore/qmetaobject.h> QT_BEGIN_HEADER @@ -57,7 +57,7 @@ class QDeclarativeContext; class QDeclarativeEngine; class QDeclarativePropertyPrivate; -class Q_QUICK1_EXPORT QDeclarativeProperty +class Q_DECLARATIVE_EXPORT QDeclarativeProperty { public: enum PropertyTypeCategory { diff --git a/src/declarative/qml/qdeclarativeproperty_p.h b/src/declarative/qml/qdeclarativeproperty_p.h index 36479c0e..6430232b 100644 --- a/src/declarative/qml/qdeclarativeproperty_p.h +++ b/src/declarative/qml/qdeclarativeproperty_p.h @@ -55,7 +55,7 @@ #include "qdeclarativeproperty.h" -#include <private/qtquick1global_p.h> +#include <private/qtdeclarativeglobal_p.h> #include <private/qobject_p.h> #include <private/qdeclarativepropertycache_p.h> #include <private/qdeclarativeguard_p.h> @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE class QDeclarativeContext; class QDeclarativeEnginePrivate; class QDeclarativeExpression; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativePropertyPrivate : public QDeclarativeRefCount +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativePropertyPrivate : public QDeclarativeRefCount { public: enum WriteFlag { BypassInterceptor = 0x01, DontRemoveBinding = 0x02, RemoveBindingOnAliasWrite = 0x04 }; diff --git a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h index 7be52ff2..c78d2410 100644 --- a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h +++ b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEPROPERTYVALUEINTERCEPTOR_H #define QDECLARATIVEPROPERTYVALUEINTERCEPTOR_H -#include <QtQuick1/qtquick1global.h> +#include <QtDeclarative/qtdeclarativeglobal.h> #include <QtCore/qobject.h> QT_BEGIN_HEADER @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeProperty; -class Q_QUICK1_EXPORT QDeclarativePropertyValueInterceptor +class Q_DECLARATIVE_EXPORT QDeclarativePropertyValueInterceptor { public: QDeclarativePropertyValueInterceptor(); diff --git a/src/declarative/qml/qdeclarativepropertyvaluesource.h b/src/declarative/qml/qdeclarativepropertyvaluesource.h index 2d58fa4a..d69a52bd 100644 --- a/src/declarative/qml/qdeclarativepropertyvaluesource.h +++ b/src/declarative/qml/qdeclarativepropertyvaluesource.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEPROPERTYVALUESOURCE_H #define QDECLARATIVEPROPERTYVALUESOURCE_H -#include <QtQuick1/qtquick1global.h> +#include <QtDeclarative/qtdeclarativeglobal.h> #include <QtCore/qobject.h> QT_BEGIN_HEADER @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeProperty; -class Q_QUICK1_EXPORT QDeclarativePropertyValueSource +class Q_DECLARATIVE_EXPORT QDeclarativePropertyValueSource { public: QDeclarativePropertyValueSource(); diff --git a/src/declarative/qml/qdeclarativerefcount_p.h b/src/declarative/qml/qdeclarativerefcount_p.h index 75c812d1..346e742e 100644 --- a/src/declarative/qml/qdeclarativerefcount_p.h +++ b/src/declarative/qml/qdeclarativerefcount_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtQuick1/qtquick1global.h> +#include <QtDeclarative/qtdeclarativeglobal.h> QT_BEGIN_HEADER @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class Q_QUICK1_EXPORT QDeclarativeRefCount +class Q_DECLARATIVE_EXPORT QDeclarativeRefCount { public: QDeclarativeRefCount(); diff --git a/src/declarative/qml/qdeclarativescriptstring.h b/src/declarative/qml/qdeclarativescriptstring.h index 5af78175..2de39762 100644 --- a/src/declarative/qml/qdeclarativescriptstring.h +++ b/src/declarative/qml/qdeclarativescriptstring.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVESCRIPTSTRING_H #define QDECLARATIVESCRIPTSTRING_H -#include <QtQuick1/qtquick1global.h> +#include <QtDeclarative/qtdeclarativeglobal.h> #include <QtCore/qstring.h> #include <QtCore/qshareddata.h> #include <QtCore/qmetatype.h> @@ -56,7 +56,7 @@ QT_MODULE(Declarative) class QObject; class QDeclarativeContext; class QDeclarativeScriptStringPrivate; -class Q_QUICK1_EXPORT QDeclarativeScriptString +class Q_DECLARATIVE_EXPORT QDeclarativeScriptString { public: QDeclarativeScriptString(); diff --git a/src/declarative/qml/qdeclarativestringconverters_p.h b/src/declarative/qml/qdeclarativestringconverters_p.h index 639a89f2..dc6971f5 100644 --- a/src/declarative/qml/qdeclarativestringconverters_p.h +++ b/src/declarative/qml/qdeclarativestringconverters_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <private/qtquick1global_p.h> +#include <private/qtdeclarativeglobal_p.h> #include <QtCore/qvariant.h> QT_BEGIN_NAMESPACE @@ -69,19 +69,19 @@ class QVector3D; // XXX - Bauhaus currently uses these methods which is why they're exported namespace QDeclarativeStringConverters { - QVariant Q_QUICK1_PRIVATE_EXPORT variantFromString(const QString &); - QVariant Q_QUICK1_PRIVATE_EXPORT variantFromString(const QString &, int preferredType, bool *ok = 0); + QVariant Q_DECLARATIVE_PRIVATE_EXPORT variantFromString(const QString &); + QVariant Q_DECLARATIVE_PRIVATE_EXPORT variantFromString(const QString &, int preferredType, bool *ok = 0); - QColor Q_QUICK1_PRIVATE_EXPORT colorFromString(const QString &, bool *ok = 0); + QColor Q_DECLARATIVE_PRIVATE_EXPORT colorFromString(const QString &, bool *ok = 0); #ifndef QT_NO_DATESTRING - QDate Q_QUICK1_PRIVATE_EXPORT dateFromString(const QString &, bool *ok = 0); - QTime Q_QUICK1_PRIVATE_EXPORT timeFromString(const QString &, bool *ok = 0); - QDateTime Q_QUICK1_PRIVATE_EXPORT dateTimeFromString(const QString &, bool *ok = 0); + QDate Q_DECLARATIVE_PRIVATE_EXPORT dateFromString(const QString &, bool *ok = 0); + QTime Q_DECLARATIVE_PRIVATE_EXPORT timeFromString(const QString &, bool *ok = 0); + QDateTime Q_DECLARATIVE_PRIVATE_EXPORT dateTimeFromString(const QString &, bool *ok = 0); #endif - QPointF Q_QUICK1_PRIVATE_EXPORT pointFFromString(const QString &, bool *ok = 0); - QSizeF Q_QUICK1_PRIVATE_EXPORT sizeFFromString(const QString &, bool *ok = 0); - QRectF Q_QUICK1_PRIVATE_EXPORT rectFFromString(const QString &, bool *ok = 0); - QVector3D Q_QUICK1_PRIVATE_EXPORT vector3DFromString(const QString &, bool *ok = 0); + QPointF Q_DECLARATIVE_PRIVATE_EXPORT pointFFromString(const QString &, bool *ok = 0); + QSizeF Q_DECLARATIVE_PRIVATE_EXPORT sizeFFromString(const QString &, bool *ok = 0); + QRectF Q_DECLARATIVE_PRIVATE_EXPORT rectFFromString(const QString &, bool *ok = 0); + QVector3D Q_DECLARATIVE_PRIVATE_EXPORT vector3DFromString(const QString &, bool *ok = 0); } QT_END_NAMESPACE diff --git a/src/declarative/qml/qdeclarativetypeloader.cpp b/src/declarative/qml/qdeclarativetypeloader.cpp index 343d5a73..a7eeeeca 100644 --- a/src/declarative/qml/qdeclarativetypeloader.cpp +++ b/src/declarative/qml/qdeclarativetypeloader.cpp @@ -47,7 +47,7 @@ #include <private/qdeclarativeglobal_p.h> #include <private/qdeclarativedebugtrace_p.h> -#include <QtQuick1/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativecomponent.h> #include <QtCore/qdebug.h> #include <QtCore/qdir.h> #include <QtCore/qdiriterator.h> diff --git a/src/declarative/qml/qdeclarativetypeloader_p.h b/src/declarative/qml/qdeclarativetypeloader_p.h index 53e92e52..397f06bb 100644 --- a/src/declarative/qml/qdeclarativetypeloader_p.h +++ b/src/declarative/qml/qdeclarativetypeloader_p.h @@ -55,8 +55,8 @@ #include <QtCore/qobject.h> #include <QtNetwork/qnetworkreply.h> -#include <QtQuick1/qdeclarativeerror.h> -#include <QtQuick1/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativeerror.h> +#include <QtDeclarative/qdeclarativeengine.h> #include <private/qdeclarativescriptparser_p.h> #include <private/qdeclarativedirparser_p.h> #include <private/qdeclarativeimport_p.h> diff --git a/src/declarative/qml/qdeclarativevaluetype_p.h b/src/declarative/qml/qdeclarativevaluetype_p.h index b643efed..7d986bb1 100644 --- a/src/declarative/qml/qdeclarativevaluetype_p.h +++ b/src/declarative/qml/qdeclarativevaluetype_p.h @@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeValueType : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeValueType : public QObject { Q_OBJECT public: @@ -81,7 +81,7 @@ public: virtual void setValue(QVariant) = 0; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeValueTypeFactory +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeValueTypeFactory { public: QDeclarativeValueTypeFactory(); diff --git a/src/declarative/qml/qdeclarativeworkerscript.cpp b/src/declarative/qml/qdeclarativeworkerscript.cpp index 2dfe3d88..fcfc70df 100644 --- a/src/declarative/qml/qdeclarativeworkerscript.cpp +++ b/src/declarative/qml/qdeclarativeworkerscript.cpp @@ -55,7 +55,7 @@ #include <QtCore/qfile.h> #include <QtCore/qdatetime.h> #include <QtNetwork/qnetworkaccessmanager.h> -#include <QtQuick1/qdeclarativeinfo.h> +#include <QtDeclarative/qdeclarativeinfo.h> #include "qdeclarativenetworkaccessmanagerfactory.h" diff --git a/src/declarative/qml/qperformancetimer_p.h b/src/declarative/qml/qperformancetimer_p.h index 98cf9c25..a1a52a1b 100644 --- a/src/declarative/qml/qperformancetimer_p.h +++ b/src/declarative/qml/qperformancetimer_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qtquick1global.h" +#include "qtdeclarativeglobal.h" QT_BEGIN_HEADER @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class Q_QUICK1_EXPORT QPerformanceTimer +class Q_DECLARATIVE_EXPORT QPerformanceTimer { public: void start(); |