diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-10-15 15:58:44 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-17 17:18:22 +0200 |
commit | 79fed8757e26f946745eec9d8bba8b91aeb1a742 (patch) | |
tree | 2bf779aff001b7e9675f52ccb270a0041de06b62 /src | |
parent | 049ca9aa5e5d6bbcf2a68be6772327a4b6ab3aa0 (diff) | |
download | qtquick1-79fed8757e26f946745eec9d8bba8b91aeb1a742.tar.gz |
Rename the QtQuick1 module back to QtDeclarative
Matches the name that this code used to have in Qt 4.
- Adapt library, change import path to 'QtDeclarative'.
- Update the tests and examples to match the new library name.
- Rename qtquick1global{_p}.h to qtdeclarativeglobal.h.
- Change exports back to Q_DECLARATIVE_[PRIVATE_]EXPORT, like
it was in Qt 4 and matching the library name again. This also
changes the include guards in qtdeclarativeglobal{,_p}.h.
- Fix occurrence of quick_debug in tools/qml/qml.pro.
Change-Id: Ibb1fb2e503f90943a2125e4ac3cc4eca3369ca3f
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src')
105 files changed, 263 insertions, 263 deletions
diff --git a/src/declarative/debugger/qdeclarativedebug.h b/src/declarative/debugger/qdeclarativedebug.h index b0d9ca2e..a9a27555 100644 --- a/src/declarative/debugger/qdeclarativedebug.h +++ b/src/declarative/debugger/qdeclarativedebug.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEDEBUG_H #define QDECLARATIVEDEBUG_H -#include <QtQuick1/qtquick1global.h> +#include <QtDeclarative/qtdeclarativeglobal.h> QT_BEGIN_HEADER @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -struct Q_QUICK1_EXPORT QDeclarativeDebuggingEnabler +struct Q_DECLARATIVE_EXPORT QDeclarativeDebuggingEnabler { QDeclarativeDebuggingEnabler(); }; diff --git a/src/declarative/debugger/qdeclarativedebugclient_p.h b/src/declarative/debugger/qdeclarativedebugclient_p.h index 95453b7d..10b358ab 100644 --- a/src/declarative/debugger/qdeclarativedebugclient_p.h +++ b/src/declarative/debugger/qdeclarativedebugclient_p.h @@ -44,7 +44,7 @@ #include <QtNetwork/qtcpsocket.h> -#include <private/qtquick1global_p.h> +#include <private/qtdeclarativeglobal_p.h> QT_BEGIN_HEADER @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeDebugConnectionPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugConnection : public QTcpSocket +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugConnection : public QTcpSocket { Q_OBJECT Q_DISABLE_COPY(QDeclarativeDebugConnection) @@ -69,7 +69,7 @@ private: }; class QDeclarativeDebugClientPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugClient : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugClient : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeDebugClient) diff --git a/src/declarative/debugger/qdeclarativedebuggerstatus_p.h b/src/declarative/debugger/qdeclarativedebuggerstatus_p.h index 0155651b..aac48e82 100644 --- a/src/declarative/debugger/qdeclarativedebuggerstatus_p.h +++ b/src/declarative/debugger/qdeclarativedebuggerstatus_p.h @@ -44,7 +44,7 @@ #include <QtCore/qobject.h> -#include <private/qtquick1global_p.h> +#include <private/qtdeclarativeglobal_p.h> QT_BEGIN_HEADER @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebuggerStatus +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebuggerStatus { public: virtual ~QDeclarativeDebuggerStatus(); diff --git a/src/declarative/debugger/qdeclarativedebughelper_p.h b/src/declarative/debugger/qdeclarativedebughelper_p.h index dc41db95..32e6f677 100644 --- a/src/declarative/debugger/qdeclarativedebughelper_p.h +++ b/src/declarative/debugger/qdeclarativedebughelper_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEDEBUGHELPER_P_H #define QDECLARATIVEDEBUGHELPER_P_H -#include <private/qtquick1global_p.h> +#include <private/qtdeclarativeglobal_p.h> QT_BEGIN_HEADER @@ -53,7 +53,7 @@ class QDeclarativeEngine; // Helper methods to access private API through a stable interface // This is used in the qmljsdebugger library of QtCreator. -class Q_QUICK1_EXPORT QDeclarativeDebugHelper +class Q_DECLARATIVE_EXPORT QDeclarativeDebugHelper { public: static QScriptEngine *getScriptEngine(QDeclarativeEngine *engine); diff --git a/src/declarative/debugger/qdeclarativedebugserver.cpp b/src/declarative/debugger/qdeclarativedebugserver.cpp index dacf2ca7..e3228f06 100644 --- a/src/declarative/debugger/qdeclarativedebugserver.cpp +++ b/src/declarative/debugger/qdeclarativedebugserver.cpp @@ -190,7 +190,7 @@ QDeclarativeDebugServer *QDeclarativeDebugServer::instance() if (appD->qmljsDebugArgumentsString().indexOf(QLatin1String("port:")) == 0) { int separatorIndex = appD->qmljsDebugArgumentsString().indexOf(QLatin1Char(',')); port = appD->qmljsDebugArgumentsString().mid(5, separatorIndex - 5).toInt(&ok); - pluginName = QLatin1String("qmldbg_tcp_qtquick1"); + pluginName = QLatin1String("qmldbg_tcp"); } else if (appD->qmljsDebugArgumentsString().contains(QLatin1String("ost"))) { pluginName = QLatin1String("qmldbg_ost"); ok = true; diff --git a/src/declarative/debugger/qdeclarativedebugserver_p.h b/src/declarative/debugger/qdeclarativedebugserver_p.h index 0b94a274..c1968cc9 100644 --- a/src/declarative/debugger/qdeclarativedebugserver_p.h +++ b/src/declarative/debugger/qdeclarativedebugserver_p.h @@ -54,7 +54,7 @@ QT_MODULE(Declarative) class QDeclarativeDebugService; class QDeclarativeDebugServerPrivate; -class Q_QUICK1_EXPORT QDeclarativeDebugServer : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativeDebugServer : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeDebugServer) diff --git a/src/declarative/debugger/qdeclarativedebugserverconnection_p.h b/src/declarative/debugger/qdeclarativedebugserverconnection_p.h index 666c4446..91181568 100644 --- a/src/declarative/debugger/qdeclarativedebugserverconnection_p.h +++ b/src/declarative/debugger/qdeclarativedebugserverconnection_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEDEBUGSERVERCONNECTION_H #define QDECLARATIVEDEBUGSERVERCONNECTION_H -#include <private/qtquick1global_p.h> +#include <private/qtdeclarativeglobal_p.h> #include <QtCore/qobject.h> // @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeDebugServer; -class Q_QUICK1_EXPORT QDeclarativeDebugServerConnection +class Q_DECLARATIVE_EXPORT QDeclarativeDebugServerConnection { public: QDeclarativeDebugServerConnection() {} diff --git a/src/declarative/debugger/qdeclarativedebugservice_p.h b/src/declarative/debugger/qdeclarativedebugservice_p.h index 892e493e..daacfc4a 100644 --- a/src/declarative/debugger/qdeclarativedebugservice_p.h +++ b/src/declarative/debugger/qdeclarativedebugservice_p.h @@ -44,7 +44,7 @@ #include <QtCore/qobject.h> -#include <private/qtquick1global_p.h> +#include <private/qtdeclarativeglobal_p.h> QT_BEGIN_HEADER @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeDebugServicePrivate; -class Q_QUICK1_EXPORT QDeclarativeDebugService : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativeDebugService : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeDebugService) diff --git a/src/declarative/debugger/qdeclarativedebugtrace_p.h b/src/declarative/debugger/qdeclarativedebugtrace_p.h index dfd478b0..d505f6d4 100644 --- a/src/declarative/debugger/qdeclarativedebugtrace_p.h +++ b/src/declarative/debugger/qdeclarativedebugtrace_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEDEBUGTRACE_P_H #define QDECLARATIVEDEBUGTRACE_P_H -#include "qtquick1global.h" +#include "qtdeclarativeglobal.h" #include <private/qdeclarativedebugservice_p.h> #include <private/qperformancetimer_p.h> @@ -65,7 +65,7 @@ struct QDeclarativeDebugData }; class QUrl; -class Q_QUICK1_EXPORT QDeclarativeDebugTrace : public QDeclarativeDebugService +class Q_DECLARATIVE_EXPORT QDeclarativeDebugTrace : public QDeclarativeDebugService { public: enum Message { diff --git a/src/declarative/debugger/qdeclarativeenginedebug_p.h b/src/declarative/debugger/qdeclarativeenginedebug_p.h index f9fc8214..d375a215 100644 --- a/src/declarative/debugger/qdeclarativeenginedebug_p.h +++ b/src/declarative/debugger/qdeclarativeenginedebug_p.h @@ -45,7 +45,7 @@ #include <QtCore/qurl.h> #include <QtCore/qvariant.h> -#include <private/qtquick1global_p.h> +#include <private/qtdeclarativeglobal_p.h> QT_BEGIN_HEADER @@ -67,7 +67,7 @@ class QDeclarativeDebugObjectReference; class QDeclarativeDebugFileReference; class QDeclarativeDebugEngineReference; class QDeclarativeEngineDebugPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeEngineDebug : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeEngineDebug : public QObject { Q_OBJECT public: @@ -114,7 +114,7 @@ private: Q_DECLARE_PRIVATE(QDeclarativeEngineDebug) }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugWatch : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugWatch : public QObject { Q_OBJECT public: @@ -145,7 +145,7 @@ private: int m_objectDebugId; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugPropertyWatch : public QDeclarativeDebugWatch +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugPropertyWatch : public QDeclarativeDebugWatch { Q_OBJECT public: @@ -158,7 +158,7 @@ private: QString m_name; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugObjectExpressionWatch : public QDeclarativeDebugWatch +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugObjectExpressionWatch : public QDeclarativeDebugWatch { Q_OBJECT public: @@ -173,7 +173,7 @@ private: }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugQuery : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugQuery : public QObject { Q_OBJECT public: @@ -197,7 +197,7 @@ private: State m_state; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugFileReference +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugFileReference { public: QDeclarativeDebugFileReference(); @@ -218,7 +218,7 @@ private: int m_columnNumber; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugEngineReference +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugEngineReference { public: QDeclarativeDebugEngineReference(); @@ -235,7 +235,7 @@ private: QString m_name; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugObjectReference +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugObjectReference { public: QDeclarativeDebugObjectReference(); @@ -269,7 +269,7 @@ private: QList<QDeclarativeDebugObjectReference> m_children; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugContextReference +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugContextReference { public: QDeclarativeDebugContextReference(); @@ -290,7 +290,7 @@ private: QList<QDeclarativeDebugContextReference> m_contexts; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugPropertyReference +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugPropertyReference { public: QDeclarativeDebugPropertyReference(); @@ -315,7 +315,7 @@ private: }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugEnginesQuery : public QDeclarativeDebugQuery +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugEnginesQuery : public QDeclarativeDebugQuery { Q_OBJECT public: @@ -330,7 +330,7 @@ private: QList<QDeclarativeDebugEngineReference> m_engines; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugRootContextQuery : public QDeclarativeDebugQuery +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugRootContextQuery : public QDeclarativeDebugQuery { Q_OBJECT public: @@ -345,7 +345,7 @@ private: QDeclarativeDebugContextReference m_context; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugObjectQuery : public QDeclarativeDebugQuery +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugObjectQuery : public QDeclarativeDebugQuery { Q_OBJECT public: @@ -361,7 +361,7 @@ private: }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugExpressionQuery : public QDeclarativeDebugQuery +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugExpressionQuery : public QDeclarativeDebugQuery { Q_OBJECT public: diff --git a/src/declarative/debugger/qdeclarativeenginedebugservice_p.h b/src/declarative/debugger/qdeclarativeenginedebugservice_p.h index 45372061..70a07e45 100644 --- a/src/declarative/debugger/qdeclarativeenginedebugservice_p.h +++ b/src/declarative/debugger/qdeclarativeenginedebugservice_p.h @@ -123,10 +123,10 @@ private: QDeclarativeWatcher *m_watch; QList<QPointer<QDeclarativeState> > m_allStates; }; -Q_QUICK1_PRIVATE_EXPORT QDataStream &operator<<(QDataStream &, const QDeclarativeEngineDebugService::QDeclarativeObjectData &); -Q_QUICK1_PRIVATE_EXPORT QDataStream &operator>>(QDataStream &, QDeclarativeEngineDebugService::QDeclarativeObjectData &); -Q_QUICK1_PRIVATE_EXPORT QDataStream &operator<<(QDataStream &, const QDeclarativeEngineDebugService::QDeclarativeObjectProperty &); -Q_QUICK1_PRIVATE_EXPORT QDataStream &operator>>(QDataStream &, QDeclarativeEngineDebugService::QDeclarativeObjectProperty &); +Q_DECLARATIVE_PRIVATE_EXPORT QDataStream &operator<<(QDataStream &, const QDeclarativeEngineDebugService::QDeclarativeObjectData &); +Q_DECLARATIVE_PRIVATE_EXPORT QDataStream &operator>>(QDataStream &, QDeclarativeEngineDebugService::QDeclarativeObjectData &); +Q_DECLARATIVE_PRIVATE_EXPORT QDataStream &operator<<(QDataStream &, const QDeclarativeEngineDebugService::QDeclarativeObjectProperty &); +Q_DECLARATIVE_PRIVATE_EXPORT QDataStream &operator>>(QDataStream &, QDeclarativeEngineDebugService::QDeclarativeObjectProperty &); QT_END_NAMESPACE diff --git a/src/declarative/debugger/qdeclarativeinspectorinterface_p.h b/src/declarative/debugger/qdeclarativeinspectorinterface_p.h index ec420796..39fb8004 100644 --- a/src/declarative/debugger/qdeclarativeinspectorinterface_p.h +++ b/src/declarative/debugger/qdeclarativeinspectorinterface_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEOBSERVERINTERFACE_H #define QDECLARATIVEOBSERVERINTERFACE_H -#include <QtQuick1/private/qtquick1global_p.h> +#include <QtDeclarative/private/qtdeclarativeglobal_p.h> QT_BEGIN_HEADER @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class Q_QUICK1_EXPORT QDeclarativeInspectorInterface +class Q_DECLARATIVE_EXPORT QDeclarativeInspectorInterface { public: QDeclarativeInspectorInterface() {} diff --git a/src/declarative/debugger/qdeclarativeinspectorservice.cpp b/src/declarative/debugger/qdeclarativeinspectorservice.cpp index f1571e1e..f2baead0 100644 --- a/src/declarative/debugger/qdeclarativeinspectorservice.cpp +++ b/src/declarative/debugger/qdeclarativeinspectorservice.cpp @@ -47,7 +47,7 @@ #include <QtCore/QDir> #include <QtCore/QPluginLoader> -#include <QtQuick1/QDeclarativeView> +#include <QtDeclarative/QDeclarativeView> QT_BEGIN_NAMESPACE diff --git a/src/declarative/debugger/qdeclarativeinspectorservice_p.h b/src/declarative/debugger/qdeclarativeinspectorservice_p.h index a7032de2..38076b5a 100644 --- a/src/declarative/debugger/qdeclarativeinspectorservice_p.h +++ b/src/declarative/debugger/qdeclarativeinspectorservice_p.h @@ -56,7 +56,7 @@ QT_MODULE(Declarative) class QDeclarativeView; class QDeclarativeInspectorInterface; -class Q_QUICK1_EXPORT QDeclarativeInspectorService : public QDeclarativeDebugService +class Q_DECLARATIVE_EXPORT QDeclarativeInspectorService : public QDeclarativeDebugService { Q_OBJECT diff --git a/src/declarative/debugger/qjsdebugservice.cpp b/src/declarative/debugger/qjsdebugservice.cpp index 4b0ea57b..0b626636 100644 --- a/src/declarative/debugger/qjsdebugservice.cpp +++ b/src/declarative/debugger/qjsdebugservice.cpp @@ -45,7 +45,7 @@ #include <QtCore/qdatastream.h> #include <QtCore/qdebug.h> #include <QtCore/qstringlist.h> -#include <QtQuick1/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativeengine.h> Q_GLOBAL_STATIC(QJSDebugService, serviceInstance) diff --git a/src/declarative/debugger/qpacketprotocol_p.h b/src/declarative/debugger/qpacketprotocol_p.h index a26ecdae..21caa18d 100644 --- a/src/declarative/debugger/qpacketprotocol_p.h +++ b/src/declarative/debugger/qpacketprotocol_p.h @@ -45,7 +45,7 @@ #include <QtCore/qobject.h> #include <QtCore/qdatastream.h> -#include <private/qtquick1global_p.h> +#include <private/qtdeclarativeglobal_p.h> QT_BEGIN_HEADER @@ -59,7 +59,7 @@ class QPacket; class QPacketAutoSend; class QPacketProtocolPrivate; -class Q_QUICK1_EXPORT QPacketProtocol : public QObject +class Q_DECLARATIVE_EXPORT QPacketProtocol : public QObject { Q_OBJECT public: @@ -91,7 +91,7 @@ private: }; -class Q_QUICK1_EXPORT QPacket : public QDataStream +class Q_DECLARATIVE_EXPORT QPacket : public QDataStream { public: QPacket(); @@ -109,7 +109,7 @@ protected: QBuffer * buf; }; -class Q_QUICK1_PRIVATE_EXPORT QPacketAutoSend : public QPacket +class Q_DECLARATIVE_PRIVATE_EXPORT QPacketAutoSend : public QPacket { public: virtual ~QPacketAutoSend(); diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index 7c3d38f1..be3978aa 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -1,9 +1,9 @@ -TARGET = QtQuick1 +TARGET = QtDeclarative QT = core-private gui-private widgets-private script-private !isEmpty(QT.xmlpatterns.name): QT_PRIVATE = xmlpatterns else: DEFINES += QT_NO_XMLPATTERNS -MODULE=quick1 +MODULE=declarative load(qt_module) DEFINES += QT_NO_URL_CAST_FROM_STRING @@ -23,8 +23,8 @@ include(graphicsitems/graphicsitems.pri) include(debugger/debugger.pri) HEADERS += \ - qtquick1global.h \ - qtquick1global_p.h + qtdeclarativeglobal.h \ + qtdeclarativeglobal_p.h linux-g++-maemo:DEFINES += QDECLARATIVEVIEW_NOBACKGROUND diff --git a/src/declarative/graphicsitems/qdeclarativeanchors_p.h b/src/declarative/graphicsitems/qdeclarativeanchors_p.h index 0bd226cd..22d69852 100644 --- a/src/declarative/graphicsitems/qdeclarativeanchors_p.h +++ b/src/declarative/graphicsitems/qdeclarativeanchors_p.h @@ -48,7 +48,7 @@ #include <QtCore/QObject> -#include <private/qtquick1global_p.h> +#include <private/qtdeclarativeglobal_p.h> QT_BEGIN_HEADER @@ -58,7 +58,7 @@ QT_MODULE(Declarative) class QDeclarativeAnchorsPrivate; class QDeclarativeAnchorLine; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeAnchors : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeAnchors : public QObject { Q_OBJECT diff --git a/src/declarative/graphicsitems/qdeclarativeevents_p_p.h b/src/declarative/graphicsitems/qdeclarativeevents_p_p.h index f9aa9e81..46651314 100644 --- a/src/declarative/graphicsitems/qdeclarativeevents_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativeevents_p_p.h @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICK1_EXPORT QDeclarativeKeyEvent : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativeKeyEvent : public QObject { Q_OBJECT Q_PROPERTY(int key READ key) @@ -89,7 +89,7 @@ private: QKeyEvent event; }; -class Q_QUICK1_EXPORT QDeclarativeMouseEvent : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativeMouseEvent : public QObject { Q_OBJECT Q_PROPERTY(int x READ x) diff --git a/src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h b/src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h index 6c169ec0..bbc0cd8b 100644 --- a/src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h +++ b/src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h @@ -43,7 +43,7 @@ #define QDECLARATIVEGRAPHICSWIDGET_P_H #include <QObject> -#include <QtQuick1/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativecomponent.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index 9dc5cff2..825bae39 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -44,7 +44,7 @@ #include "private/qdeclarativeevents_p_p.h" #include <private/qdeclarativeengine_p.h> #include <private/qgraphicsitem_p.h> -#include <QtQuick1/private/qdeclarativeitem_p.h> +#include <QtDeclarative/private/qdeclarativeitem_p.h> #include <qdeclarativeengine.h> #include <qdeclarativeopenmetaobject_p.h> diff --git a/src/declarative/graphicsitems/qdeclarativeitem.h b/src/declarative/graphicsitems/qdeclarativeitem.h index 95f9458f..503911c0 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.h +++ b/src/declarative/graphicsitems/qdeclarativeitem.h @@ -42,8 +42,8 @@ #ifndef QDECLARATIVEITEM_H #define QDECLARATIVEITEM_H -#include <QtQuick1/qdeclarative.h> -#include <QtQuick1/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarative.h> +#include <QtDeclarative/qdeclarativecomponent.h> #include <QtCore/QObject> #include <QtCore/QList> @@ -64,7 +64,7 @@ class QDeclarativeTransition; class QDeclarativeKeyEvent; class QDeclarativeAnchors; class QDeclarativeItemPrivate; -class Q_QUICK1_EXPORT QDeclarativeItem : public QGraphicsObject, public QDeclarativeParserStatus +class Q_DECLARATIVE_EXPORT QDeclarativeItem : public QGraphicsObject, public QDeclarativeParserStatus { Q_OBJECT Q_INTERFACES(QDeclarativeParserStatus) @@ -216,7 +216,7 @@ T qobject_cast(QGraphicsItem *item) } #ifndef QT_NO_DEBUG_STREAM -QDebug Q_QUICK1_EXPORT operator<<(QDebug debug, QDeclarativeItem *item); +QDebug Q_DECLARATIVE_EXPORT operator<<(QDebug debug, QDeclarativeItem *item); #endif QT_END_NAMESPACE diff --git a/src/declarative/graphicsitems/qdeclarativeitem_p.h b/src/declarative/graphicsitems/qdeclarativeitem_p.h index cab49b1a..34269a93 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem_p.h +++ b/src/declarative/graphicsitems/qdeclarativeitem_p.h @@ -114,7 +114,7 @@ private: qreal m_height; }; -class Q_QUICK1_EXPORT QDeclarativeItemPrivate : public QGraphicsItemPrivate +class Q_DECLARATIVE_EXPORT QDeclarativeItemPrivate : public QGraphicsItemPrivate { Q_DECLARE_PUBLIC(QDeclarativeItem) diff --git a/src/declarative/graphicsitems/qdeclarativepositioners_p.h b/src/declarative/graphicsitems/qdeclarativepositioners_p.h index 40bb6c36..70e47094 100644 --- a/src/declarative/graphicsitems/qdeclarativepositioners_p.h +++ b/src/declarative/graphicsitems/qdeclarativepositioners_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeBasePositionerPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeBasePositioner : public QDeclarativeImplicitSizeItem +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeBasePositioner : public QDeclarativeImplicitSizeItem { Q_OBJECT diff --git a/src/declarative/graphicsitems/qdeclarativerectangle_p.h b/src/declarative/graphicsitems/qdeclarativerectangle_p.h index c11a8ab7..eb29efe8 100644 --- a/src/declarative/graphicsitems/qdeclarativerectangle_p.h +++ b/src/declarative/graphicsitems/qdeclarativerectangle_p.h @@ -46,14 +46,14 @@ #include <QtGui/qbrush.h> -#include <private/qtquick1global_p.h> +#include <private/qtdeclarativeglobal_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class Q_QUICK1_PRIVATE_EXPORT QDeclarativePen : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativePen : public QObject { Q_OBJECT @@ -133,7 +133,7 @@ private: }; class QDeclarativeRectanglePrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeRectangle : public QDeclarativeItem +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeRectangle : public QDeclarativeItem { Q_OBJECT diff --git a/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h b/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h index 852cf6f3..5d5d4d7e 100644 --- a/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeScaleGrid : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeScaleGrid : public QObject { Q_OBJECT Q_ENUMS(TileRule) @@ -95,7 +95,7 @@ private: int _bottom; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeGridScaledImage +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeGridScaledImage { public: QDeclarativeGridScaledImage(); diff --git a/src/declarative/graphicsitems/qdeclarativetext_p.h b/src/declarative/graphicsitems/qdeclarativetext_p.h index 9602727f..650f324d 100644 --- a/src/declarative/graphicsitems/qdeclarativetext_p.h +++ b/src/declarative/graphicsitems/qdeclarativetext_p.h @@ -45,7 +45,7 @@ #include <QtGui/qtextoption.h> #include "qdeclarativeimplicitsizeitem_p.h" -#include <private/qtquick1global_p.h> +#include <private/qtdeclarativeglobal_p.h> QT_BEGIN_HEADER @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeTextPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeText : public QDeclarativeImplicitSizeItem +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeText : public QDeclarativeImplicitSizeItem { Q_OBJECT Q_ENUMS(HAlignment) 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(); diff --git a/src/declarative/qtquick1global.h b/src/declarative/qtdeclarativeglobal.h index 033833ab..39e11018 100644 --- a/src/declarative/qtquick1global.h +++ b/src/declarative/qtdeclarativeglobal.h @@ -39,25 +39,25 @@ ** ****************************************************************************/ -#ifndef QTQUICK1GLOBAL_H -#define QTQUICK1GLOBAL_H +#ifndef QTDECLARATIVEGLOBAL_H +#define QTDECLARATIVEGLOBAL_H #include <QtCore/qglobal.h> // This definition is in the process of being removed from qtbase - once it // has been expunged, this will no longer be necssary: -#if defined(Q_QUICK1_EXPORT) -# undef Q_QUICK1_EXPORT +#if defined(Q_DECLARATIVE_EXPORT) +# undef Q_DECLARATIVE_EXPORT #endif #ifndef QT_STATIC -# if defined(QT_BUILD_QUICK1_LIB) -# define Q_QUICK1_EXPORT Q_DECL_EXPORT +# if defined(QT_BUILD_DECLARATIVE_LIB) +# define Q_DECLARATIVE_EXPORT Q_DECL_EXPORT # else -# define Q_QUICK1_EXPORT Q_DECL_IMPORT +# define Q_DECLARATIVE_EXPORT Q_DECL_IMPORT # endif #else -# define Q_QUICK1_EXPORT +# define Q_DECLARATIVE_EXPORT #endif -#endif // QTQUICK1GLOBAL_H +#endif // QTDECLARATIVEGLOBAL_H diff --git a/src/declarative/qtquick1global_p.h b/src/declarative/qtdeclarativeglobal_p.h index 38d9c7a2..f18c5c6c 100644 --- a/src/declarative/qtquick1global_p.h +++ b/src/declarative/qtdeclarativeglobal_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QTQUICK1GLOBAL_P_H -#define QTQUICK1GLOBAL_P_H +#ifndef QTDECLARATIVEGLOBAL_P_H +#define QTDECLARATIVEGLOBAL_P_H // // W A R N I N G @@ -53,8 +53,8 @@ // We mean it. // -#include "qtquick1global.h" +#include "qtdeclarativeglobal.h" -#define Q_QUICK1_PRIVATE_EXPORT Q_QUICK1_EXPORT +#define Q_DECLARATIVE_PRIVATE_EXPORT Q_DECLARATIVE_EXPORT -#endif // QTQUICK1GLOBAL_P_H +#endif // QTDECLARATIVEGLOBAL_P_H diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/declarative/util/qdeclarativeanimation_p.h index 3f29d2d6..746d9f75 100644 --- a/src/declarative/util/qdeclarativeanimation_p.h +++ b/src/declarative/util/qdeclarativeanimation_p.h @@ -63,7 +63,7 @@ QT_MODULE(Declarative) class QDeclarativeAbstractAnimationPrivate; class QDeclarativeAnimationGroup; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeAbstractAnimation : public QObject, public QDeclarativePropertyValueSource, public QDeclarativeParserStatus +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeAbstractAnimation : public QObject, public QDeclarativePropertyValueSource, public QDeclarativeParserStatus { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeAbstractAnimation) @@ -165,7 +165,7 @@ protected: }; class QDeclarativeScriptActionPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeScriptAction : public QDeclarativeAbstractAnimation +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeScriptAction : public QDeclarativeAbstractAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeScriptAction) diff --git a/src/declarative/util/qdeclarativeapplication_p.h b/src/declarative/util/qdeclarativeapplication_p.h index f1eea59a..9afcd623 100644 --- a/src/declarative/util/qdeclarativeapplication_p.h +++ b/src/declarative/util/qdeclarativeapplication_p.h @@ -44,7 +44,7 @@ #include <QtCore/QObject> #include <qdeclarative.h> -#include <private/qtquick1global_p.h> +#include <private/qtdeclarativeglobal_p.h> QT_BEGIN_HEADER @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeApplicationPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeApplication : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeApplication : public QObject { Q_OBJECT Q_PROPERTY(bool active READ active NOTIFY activeChanged) diff --git a/src/declarative/util/qdeclarativebehavior_p.h b/src/declarative/util/qdeclarativebehavior_p.h index 40f8926b..6646d03b 100644 --- a/src/declarative/util/qdeclarativebehavior_p.h +++ b/src/declarative/util/qdeclarativebehavior_p.h @@ -57,7 +57,7 @@ QT_MODULE(Declarative) class QDeclarativeAbstractAnimation; class QDeclarativeBehaviorPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeBehavior : public QObject, public QDeclarativePropertyValueInterceptor +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeBehavior : public QObject, public QDeclarativePropertyValueInterceptor { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeBehavior) diff --git a/src/declarative/util/qdeclarativelistmodel_p.h b/src/declarative/util/qdeclarativelistmodel_p.h index 5c06aa61..52e442c7 100644 --- a/src/declarative/util/qdeclarativelistmodel_p.h +++ b/src/declarative/util/qdeclarativelistmodel_p.h @@ -64,7 +64,7 @@ class NestedListModel; class QDeclarativeListModelWorkerAgent; struct ModelNode; class FlatListScriptClass; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeListModel : public QListModelInterface +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeListModel : public QListModelInterface { Q_OBJECT Q_PROPERTY(int count READ count NOTIFY countChanged) diff --git a/src/declarative/util/qdeclarativeopenmetaobject_p.h b/src/declarative/util/qdeclarativeopenmetaobject_p.h index 52486337..de09c514 100644 --- a/src/declarative/util/qdeclarativeopenmetaobject_p.h +++ b/src/declarative/util/qdeclarativeopenmetaobject_p.h @@ -45,7 +45,7 @@ #include <QtCore/QMetaObject> #include <QtCore/QObject> -#include <private/qtquick1global_p.h> +#include <private/qtdeclarativeglobal_p.h> #include <private/qdeclarativerefcount_p.h> #include <private/qobject_p.h> @@ -58,7 +58,7 @@ QT_MODULE(Declarative) class QDeclarativeEngine; class QMetaPropertyBuilder; class QDeclarativeOpenMetaObjectTypePrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeOpenMetaObjectType : public QDeclarativeRefCount +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeOpenMetaObjectType : public QDeclarativeRefCount { public: QDeclarativeOpenMetaObjectType(const QMetaObject *base, QDeclarativeEngine *engine); @@ -79,7 +79,7 @@ private: }; class QDeclarativeOpenMetaObjectPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeOpenMetaObject : public QAbstractDynamicMetaObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeOpenMetaObject : public QAbstractDynamicMetaObject { public: QDeclarativeOpenMetaObject(QObject *, bool = true); diff --git a/src/declarative/util/qdeclarativepixmapcache_p.h b/src/declarative/util/qdeclarativepixmapcache_p.h index dddeb4b5..868b4c68 100644 --- a/src/declarative/util/qdeclarativepixmapcache_p.h +++ b/src/declarative/util/qdeclarativepixmapcache_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEPIXMAPCACHE_H #define QDECLARATIVEPIXMAPCACHE_H -#include <private/qtquick1global_p.h> +#include <private/qtdeclarativeglobal_p.h> #include <QtCore/qcoreapplication.h> #include <QtCore/qstring.h> @@ -57,7 +57,7 @@ QT_MODULE(Declarative) class QDeclarativeEngine; class QDeclarativePixmapData; -class Q_QUICK1_EXPORT QDeclarativePixmap +class Q_DECLARATIVE_EXPORT QDeclarativePixmap { Q_DECLARE_TR_FUNCTIONS(QDeclarativePixmap) public: diff --git a/src/declarative/util/qdeclarativepropertychanges_p.h b/src/declarative/util/qdeclarativepropertychanges_p.h index e8f5b09e..eaa19db2 100644 --- a/src/declarative/util/qdeclarativepropertychanges_p.h +++ b/src/declarative/util/qdeclarativepropertychanges_p.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativePropertyChangesPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativePropertyChanges : public QDeclarativeStateOperation +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativePropertyChanges : public QDeclarativeStateOperation { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativePropertyChanges) diff --git a/src/declarative/util/qdeclarativepropertymap.h b/src/declarative/util/qdeclarativepropertymap.h index aeaba91d..25dd12c8 100644 --- a/src/declarative/util/qdeclarativepropertymap.h +++ b/src/declarative/util/qdeclarativepropertymap.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEPROPERTYMAP_H #define QDECLARATIVEPROPERTYMAP_H -#include <QtQuick1/qtquick1global.h> +#include <QtDeclarative/qtdeclarativeglobal.h> #include <QtCore/QObject> #include <QtCore/QHash> #include <QtCore/QStringList> @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativePropertyMapPrivate; -class Q_QUICK1_EXPORT QDeclarativePropertyMap : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativePropertyMap : public QObject { Q_OBJECT public: diff --git a/src/declarative/util/qdeclarativestate_p.h b/src/declarative/util/qdeclarativestate_p.h index 797e871c..e879edf7 100644 --- a/src/declarative/util/qdeclarativestate_p.h +++ b/src/declarative/util/qdeclarativestate_p.h @@ -46,7 +46,7 @@ #include <qdeclarativeproperty.h> #include <QtCore/qobject.h> #include <QtCore/qsharedpointer.h> -#include <private/qtquick1global_p.h> +#include <private/qtdeclarativeglobal_p.h> QT_BEGIN_HEADER @@ -58,7 +58,7 @@ class QDeclarativeActionEvent; class QDeclarativeAbstractBinding; class QDeclarativeBinding; class QDeclarativeExpression; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeAction +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeAction { public: QDeclarativeAction(); @@ -115,7 +115,7 @@ public: class QDeclarativeStateGroup; class QDeclarativeState; class QDeclarativeStateOperationPrivate; -class Q_QUICK1_EXPORT QDeclarativeStateOperation : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativeStateOperation : public QObject { Q_OBJECT public: @@ -140,7 +140,7 @@ typedef QDeclarativeStateOperation::ActionList QDeclarativeStateActions; class QDeclarativeTransition; class QDeclarativeStatePrivate; -class Q_QUICK1_EXPORT QDeclarativeState : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativeState : public QObject { Q_OBJECT diff --git a/src/declarative/util/qdeclarativestategroup_p.h b/src/declarative/util/qdeclarativestategroup_p.h index ff25f86c..4609af50 100644 --- a/src/declarative/util/qdeclarativestategroup_p.h +++ b/src/declarative/util/qdeclarativestategroup_p.h @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeStateGroupPrivate; -class Q_QUICK1_EXPORT QDeclarativeStateGroup : public QObject, public QDeclarativeParserStatus +class Q_DECLARATIVE_EXPORT QDeclarativeStateGroup : public QObject, public QDeclarativeParserStatus { Q_OBJECT Q_INTERFACES(QDeclarativeParserStatus) diff --git a/src/declarative/util/qdeclarativestateoperations_p.h b/src/declarative/util/qdeclarativestateoperations_p.h index 203c1280..d18153aa 100644 --- a/src/declarative/util/qdeclarativestateoperations_p.h +++ b/src/declarative/util/qdeclarativestateoperations_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeParentChangePrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeParentChange : public QDeclarativeStateOperation, public QDeclarativeActionEvent +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeParentChange : public QDeclarativeStateOperation, public QDeclarativeActionEvent { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeParentChange) @@ -251,7 +251,7 @@ private: }; class QDeclarativeAnchorChangesPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeAnchorChanges : public QDeclarativeStateOperation, public QDeclarativeActionEvent +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeAnchorChanges : public QDeclarativeStateOperation, public QDeclarativeActionEvent { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeAnchorChanges) diff --git a/src/declarative/util/qdeclarativetimer_p.h b/src/declarative/util/qdeclarativetimer_p.h index a982aac3..111723e5 100644 --- a/src/declarative/util/qdeclarativetimer_p.h +++ b/src/declarative/util/qdeclarativetimer_p.h @@ -47,7 +47,7 @@ #include <QtCore/qobject.h> #include <QtCore/qabstractanimation.h> -#include <private/qtquick1global_p.h> +#include <private/qtdeclarativeglobal_p.h> QT_BEGIN_HEADER @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeTimerPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeTimer : public QObject, public QDeclarativeParserStatus +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeTimer : public QObject, public QDeclarativeParserStatus { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeTimer) diff --git a/src/declarative/util/qdeclarativetransition_p.h b/src/declarative/util/qdeclarativetransition_p.h index db1aa54a..91472909 100644 --- a/src/declarative/util/qdeclarativetransition_p.h +++ b/src/declarative/util/qdeclarativetransition_p.h @@ -57,7 +57,7 @@ QT_MODULE(Declarative) class QDeclarativeAbstractAnimation; class QDeclarativeTransitionPrivate; class QDeclarativeTransitionManager; -class Q_QUICK1_EXPORT QDeclarativeTransition : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativeTransition : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeTransition) diff --git a/src/declarative/util/qdeclarativeview.h b/src/declarative/util/qdeclarativeview.h index f3d18ac2..70995eec 100644 --- a/src/declarative/util/qdeclarativeview.h +++ b/src/declarative/util/qdeclarativeview.h @@ -47,7 +47,7 @@ #include <QtWidgets/qgraphicssceneevent.h> #include <QtWidgets/qgraphicsview.h> #include <QtWidgets/qwidget.h> -#include <QtQuick1/qdeclarativedebug.h> +#include <QtDeclarative/qdeclarativedebug.h> QT_BEGIN_HEADER @@ -61,7 +61,7 @@ class QDeclarativeContext; class QDeclarativeError; class QDeclarativeViewPrivate; -class Q_QUICK1_EXPORT QDeclarativeView : public QGraphicsView +class Q_DECLARATIVE_EXPORT QDeclarativeView : public QGraphicsView { Q_OBJECT Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMode) diff --git a/src/declarative/util/qlistmodelinterface_p.h b/src/declarative/util/qlistmodelinterface_p.h index beccea34..ceaecdeb 100644 --- a/src/declarative/util/qlistmodelinterface_p.h +++ b/src/declarative/util/qlistmodelinterface_p.h @@ -45,7 +45,7 @@ #include <QtCore/QHash> #include <QtCore/QVariant> -#include <private/qtquick1global_p.h> +#include <private/qtdeclarativeglobal_p.h> QT_BEGIN_HEADER @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class Q_QUICK1_PRIVATE_EXPORT QListModelInterface : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QListModelInterface : public QObject { Q_OBJECT public: diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro index 526417ed..32ecac61 100644 --- a/src/imports/folderlistmodel/folderlistmodel.pro +++ b/src/imports/folderlistmodel/folderlistmodel.pro @@ -1,15 +1,15 @@ TARGET = qmlfolderlistmodelplugin -TARGETPATH = QtQuick1/Qt/labs/folderlistmodel +TARGETPATH = QtDeclarative/Qt/labs/folderlistmodel include(../qimportbase.pri) -QT += widgets quick1 script +QT += widgets declarative script SOURCES += qdeclarativefolderlistmodel.cpp plugin.cpp HEADERS += qdeclarativefolderlistmodel.h OTHER_FILES += folderlistmodel.json -DESTDIR = $$QT.quick1.imports/$$TARGETPATH +DESTDIR = $$QT.declarative.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/imports/folderlistmodel/plugin.cpp b/src/imports/folderlistmodel/plugin.cpp index dab7e479..76ec6a65 100644 --- a/src/imports/folderlistmodel/plugin.cpp +++ b/src/imports/folderlistmodel/plugin.cpp @@ -38,8 +38,8 @@ ** ****************************************************************************/ -#include <QtQuick1/qdeclarativeextensionplugin.h> -#include <QtQuick1/qdeclarative.h> +#include <QtDeclarative/qdeclarativeextensionplugin.h> +#include <QtDeclarative/qdeclarative.h> #include "qdeclarativefolderlistmodel.h" diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro index 9bc82bf5..918f7a9a 100644 --- a/src/imports/gestures/gestures.pro +++ b/src/imports/gestures/gestures.pro @@ -1,15 +1,15 @@ TARGET = qmlgesturesplugin -TARGETPATH = QtQuick1/Qt/labs/gestures +TARGETPATH = QtDeclarative/Qt/labs/gestures include(../qimportbase.pri) -QT += quick1 quick1-private widgets widgets-private gui gui-private core-private script-private +QT += declarative declarative-private widgets widgets-private gui gui-private core-private script-private SOURCES += qdeclarativegesturearea.cpp plugin.cpp HEADERS += qdeclarativegesturearea_p.h OTHER_FILES += gestures.json -DESTDIR = $$QT.quick1.imports/$$TARGETPATH +DESTDIR = $$QT.declarative.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/imports/gestures/plugin.cpp b/src/imports/gestures/plugin.cpp index 2d34f2d0..5c938fe0 100644 --- a/src/imports/gestures/plugin.cpp +++ b/src/imports/gestures/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include <QtQuick1/qdeclarativeextensionplugin.h> -#include <QtQuick1/qdeclarative.h> +#include <QtDeclarative/qdeclarativeextensionplugin.h> +#include <QtDeclarative/qdeclarative.h> #include "qdeclarativegesturearea_p.h" diff --git a/src/imports/particles/particles.cpp b/src/imports/particles/particles.cpp index 0f5ee3a6..15f1ca4f 100644 --- a/src/imports/particles/particles.cpp +++ b/src/imports/particles/particles.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include <QtQuick1/qdeclarativeextensionplugin.h> -#include <QtQuick1/qdeclarative.h> +#include <QtDeclarative/qdeclarativeextensionplugin.h> +#include <QtDeclarative/qdeclarative.h> #include "qdeclarativeparticles_p.h" diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro index b4ce049d..029d6595 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -1,8 +1,8 @@ TARGET = qmlparticlesplugin -TARGETPATH = QtQuick1/Qt/labs/particles +TARGETPATH = QtDeclarative/Qt/labs/particles include(../qimportbase.pri) -QT += quick1 quick1-private core-private gui-private widgets-private +QT += declarative declarative-private core-private gui-private widgets-private SOURCES += \ qdeclarativeparticles.cpp \ @@ -13,7 +13,7 @@ HEADERS += \ OTHER_FILES += particles.json -DESTDIR = $$QT.quick1.imports/$$TARGETPATH +DESTDIR = $$QT.declarative.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/imports/particles/qdeclarativeparticles_p.h b/src/imports/particles/qdeclarativeparticles_p.h index 69f646c2..fc58ad92 100644 --- a/src/imports/particles/qdeclarativeparticles_p.h +++ b/src/imports/particles/qdeclarativeparticles_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEPARTICLES_H #define QDECLARATIVEPARTICLES_H -#include <QtQuick1/qdeclarativeitem.h> +#include <QtDeclarative/qdeclarativeitem.h> QT_BEGIN_HEADER diff --git a/src/imports/qimportbase.pri b/src/imports/qimportbase.pri index 81c737af..b1ecbea4 100644 --- a/src/imports/qimportbase.pri +++ b/src/imports/qimportbase.pri @@ -12,7 +12,7 @@ isEmpty(TARGET) { QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir copy2build.input = QMLDIRFILE -copy2build.output = $$QT.quick1.imports/$$TARGETPATH/qmldir +copy2build.output = $$QT.declarative.imports/$$TARGETPATH/qmldir !contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} copy2build.name = COPY ${QMAKE_FILE_IN} diff --git a/src/imports/shaders/qmlshadersplugin_plugin.cpp b/src/imports/shaders/qmlshadersplugin_plugin.cpp index 7004550d..eb234bd5 100644 --- a/src/imports/shaders/qmlshadersplugin_plugin.cpp +++ b/src/imports/shaders/qmlshadersplugin_plugin.cpp @@ -43,7 +43,7 @@ #include "shadereffectitem.h" #include "shadereffectsource.h" -#include <QtQuick1/qdeclarative.h> +#include <QtDeclarative/qdeclarative.h> void qmlshaderspluginPlugin::registerTypes(const char *uri) { diff --git a/src/imports/shaders/qmlshadersplugin_plugin.h b/src/imports/shaders/qmlshadersplugin_plugin.h index 3b7998a9..ae980e4f 100644 --- a/src/imports/shaders/qmlshadersplugin_plugin.h +++ b/src/imports/shaders/qmlshadersplugin_plugin.h @@ -42,7 +42,7 @@ #ifndef QMLSHADERSPLUGIN_PLUGIN_H #define QMLSHADERSPLUGIN_PLUGIN_H -#include <QtQuick1/QDeclarativeExtensionPlugin> +#include <QtDeclarative/QDeclarativeExtensionPlugin> class qmlshaderspluginPlugin : public QDeclarativeExtensionPlugin { diff --git a/src/imports/shaders/shaders.pro b/src/imports/shaders/shaders.pro index ae9cb8b1..16e8e536 100644 --- a/src/imports/shaders/shaders.pro +++ b/src/imports/shaders/shaders.pro @@ -1,8 +1,8 @@ TARGET = qmlshadersplugin -TARGETPATH = QtQuick1/Qt/labs/shaders +TARGETPATH = QtDeclarative/Qt/labs/shaders include(../qimportbase.pri) -QT += quick1 widgets opengl +QT += declarative widgets opengl SOURCES += \ qmlshadersplugin_plugin.cpp \ @@ -23,7 +23,7 @@ HEADERS += \ OTHER_FILES += shaders.json -DESTDIR = $$QT.quick1.imports/$$TARGETPATH +DESTDIR = $$QT.declarative.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/imports/webview/webview.pro b/src/imports/webview/webview.pro index 9ed375db..e46d9efe 100644 --- a/src/imports/webview/webview.pro +++ b/src/imports/webview/webview.pro @@ -2,14 +2,14 @@ TARGET = qmlwebkitplugin TARGETPATH = QtQuick1/QtWebKit include(../qimportbase.pri) -QT += quick1 quick1-private widgets widgets-private gui gui-private core-private script-private webkit +QT += declarative declarative-private widgets widgets-private gui gui-private core-private script-private webkit SOURCES += qdeclarativewebview.cpp plugin.cpp HEADERS += qdeclarativewebview_p.h OTHER_FILES += plugin.json -DESTDIR = $$QT.quick1.imports/$$TARGETPATH +DESTDIR = $$QT.declarative.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.cpp b/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.cpp index 0d6bfee3..df6a1be4 100644 --- a/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -54,9 +54,9 @@ #include <QtCore/QCoreApplication> #include <QtCore/QDir> #include <QtCore/QFileInfo> -#include <QtQuick1/QDeclarativeComponent> -#include <QtQuick1/QDeclarativeEngine> -#include <QtQuick1/QDeclarativeContext> +#include <QtDeclarative/QDeclarativeComponent> +#include <QtDeclarative/QDeclarativeEngine> +#include <QtDeclarative/QDeclarativeContext> #if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800 diff --git a/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.h b/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.h index 9d767440..9c1d84a4 100644 --- a/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.h +++ b/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.h @@ -52,7 +52,7 @@ #ifndef QMLAPPLICATIONVIEWER_H #define QMLAPPLICATIONVIEWER_H -#include <QtQuick1/QDeclarativeView> +#include <QtDeclarative/QDeclarativeView> class QmlApplicationViewer : public QDeclarativeView { diff --git a/src/plugins/qdeclarativeview/qdeclarativeview.pro b/src/plugins/qdeclarativeview/qdeclarativeview.pro index 6b63dfb2..2f8009cb 100644 --- a/src/plugins/qdeclarativeview/qdeclarativeview.pro +++ b/src/plugins/qdeclarativeview/qdeclarativeview.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = qdeclarativeview CONFIG += qt warn_on plugin designer -QT += quick1 widgets designer +QT += declarative widgets designer DESTDIR = $$QT.designer.plugins/designer contains(TEMPLATE, ".*lib"):TARGET = $$qtLibraryTarget($$TARGET) diff --git a/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp b/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp index e3eaca64..2b61a9cb 100644 --- a/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp +++ b/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp @@ -45,7 +45,7 @@ #include <QtDesigner/QExtensionManager> #include <QtCore/qplugin.h> -#include <QtQuick1/QDeclarativeView> +#include <QtDeclarative/QDeclarativeView> static const char toolTipC[] = "QtDeclarative view widget"; @@ -79,7 +79,7 @@ QString QDeclarativeViewPlugin::whatsThis() const QString QDeclarativeViewPlugin::includeFile() const { - return QStringLiteral("QtQuick1/QDeclarativeView"); + return QStringLiteral("QtDeclarative/QDeclarativeView"); } QIcon QDeclarativeViewPlugin::icon() const diff --git a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp index 1386ac4a..9d0cee64 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp @@ -44,10 +44,10 @@ #include "abstracttool.h" #include "qdeclarativeinspectorprotocol.h" -#include <QtQuick1/QDeclarativeEngine> -#include <QtQuick1/QDeclarativeComponent> +#include <QtDeclarative/QDeclarativeEngine> +#include <QtDeclarative/QDeclarativeComponent> #include <QtCore/private/qabstractanimation_p.h> -#include <QtQuick1/private/qdeclarativeinspectorservice_p.h> +#include <QtDeclarative/private/qdeclarativeinspectorservice_p.h> #include <QtGui/QMouseEvent> diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp index c40e8536..ab1acf0c 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp @@ -52,8 +52,8 @@ #include <QtWidgets/QAction> #include <QtWidgets/QGraphicsObject> -#include <QtQuick1/QDeclarativeItem> -#include <QtQuick1/QDeclarativeEngine> +#include <QtDeclarative/QDeclarativeItem> +#include <QtDeclarative/QDeclarativeEngine> #include <QtCore/QDebug> diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp index 31fc1753..b6b6c0ae 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp @@ -48,7 +48,7 @@ #include "editor/livelayeritem.h" #include "editor/boundingrecthighlighter.h" -#include <QtQuick1/QDeclarativeItem> +#include <QtDeclarative/QDeclarativeItem> #include <QtGui/QMouseEvent> namespace QmlJSDebugger { diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.h b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.h index 4ad457e9..1ac012fb 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.h +++ b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.h @@ -47,7 +47,7 @@ #include "abstractviewinspector.h" #include <QtCore/QScopedPointer> -#include <QtQuick1/QDeclarativeView> +#include <QtDeclarative/QDeclarativeView> namespace QmlJSDebugger { namespace QtQuick1 { diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector_p.h b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector_p.h index 8316c5f1..a0cbdf1f 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector_p.h +++ b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector_p.h @@ -45,11 +45,11 @@ #include "qdeclarativeviewinspector.h" #include <QtCore/QScopedPointer> -#include <QtQuick1/QDeclarativeView> +#include <QtDeclarative/QDeclarativeView> #include <QtCore/QPointer> #include <QtCore/QPointF> -#include <QtQuick1/private/qdeclarativeinspectorservice_p.h> +#include <QtDeclarative/private/qdeclarativeinspectorservice_p.h> namespace QmlJSDebugger { namespace QtQuick1 { diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro index 9e62390e..46ba748b 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro +++ b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro @@ -1,9 +1,9 @@ TARGET = qmldbg_inspector -QT += quick1 quick1-private gui widgets core-private +QT += declarative declarative-private gui widgets core-private load(qt_plugin) -DESTDIR = $$QT.quick1.plugins/qmltooling +DESTDIR = $$QT.declarative.plugins/qmltooling INCLUDEPATH *= $$PWD diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmlinspectorconstants.h b/src/plugins/qmltooling/qmldbg_inspector/qmlinspectorconstants.h index 02e4f904..f65e70a7 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qmlinspectorconstants.h +++ b/src/plugins/qmltooling/qmldbg_inspector/qmlinspectorconstants.h @@ -42,7 +42,7 @@ #ifndef QMLINSPECTORCONSTANTS_H #define QMLINSPECTORCONSTANTS_H -#include <QtQuick1/private/qdeclarativeglobal_p.h> +#include <QtDeclarative/private/qdeclarativeglobal_p.h> namespace QmlJSDebugger { namespace Constants { diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.cpp b/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.cpp index bb81aa4f..edd91d2f 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.cpp @@ -43,8 +43,8 @@ #include "qdeclarativeviewinspector.h" #include <QtCore/qplugin.h> -#include <QtQuick1/private/qdeclarativeinspectorservice_p.h> -#include <QtQuick1/qdeclarativeview.h> +#include <QtDeclarative/private/qdeclarativeinspectorservice_p.h> +#include <QtDeclarative/qdeclarativeview.h> namespace QmlJSDebugger { namespace QtQuick1 { diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.h b/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.h index 2e751af2..69d1d628 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.h +++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.h @@ -43,7 +43,7 @@ #define QDECLARATIVEINSPECTORPLUGIN_H #include <QtCore/QPointer> -#include <QtQuick1/private/qdeclarativeinspectorinterface_p.h> +#include <QtDeclarative/private/qdeclarativeinspectorinterface_p.h> namespace QmlJSDebugger { diff --git a/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro index a479cf93..b6857be6 100644 --- a/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro +++ b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro @@ -1,9 +1,9 @@ -TARGET = qmldbg_tcp_qtquick1 -QT += quick1 quick1-private network +TARGET = qmldbg_tcp_qtdeclarative +QT += declarative declarative-private network load(qt_plugin) -DESTDIR = $$QT.quick1.plugins/qmltooling +DESTDIR = $$QT.declarative.plugins/qmltooling SOURCES += \ qtcpserverconnection.cpp diff --git a/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qtcpserverconnection.h b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qtcpserverconnection.h index 14480714..b5798e4e 100644 --- a/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qtcpserverconnection.h +++ b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qtcpserverconnection.h @@ -42,7 +42,7 @@ #ifndef QTCPSERVERCONNECTION_H #define QTCPSERVERCONNECTION_H -#include <QtQuick1/private/qdeclarativedebugserverconnection_p.h> +#include <QtDeclarative/private/qdeclarativedebugserverconnection_p.h> QT_BEGIN_NAMESPACE |