diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-04-05 14:10:08 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-05 07:21:51 +0200 |
| commit | 5874e29b851101291a93278351da32a5cdbade9c (patch) | |
| tree | ee15bf62778906e7acec6dc783ade5b78dab954d /src/quick | |
| parent | 82a048c3cff06dd6e9a97a72d235decb1a39e1c3 (diff) | |
Create plugins for Particles and Window submodules
To prevent errors when QML files import QtQuick.Particles or
QtQuick.Window before importing QtQuick itself, create plugins for
these submodules that make their import statements independent of
the QtQuick import.
Remove the automatic re-ordering of the imports list prior to loading
to ensure registered name conflicts can be resolved by changing the
order of import statements.
Task-number: QTBUG-24369
Change-Id: I248625fa30a813dddd2a64feb9a489768931939f
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquickwindowmodule_p.h | 4 | ||||
| -rw-r--r-- | src/quick/particles/qquickparticlesmodule_p.h | 10 | ||||
| -rw-r--r-- | src/quick/qtquick2.cpp | 4 |
3 files changed, 7 insertions, 11 deletions
diff --git a/src/quick/items/qquickwindowmodule_p.h b/src/quick/items/qquickwindowmodule_p.h index 72fd2b32bd..156ccec127 100644 --- a/src/quick/items/qquickwindowmodule_p.h +++ b/src/quick/items/qquickwindowmodule_p.h @@ -42,14 +42,14 @@ #ifndef QQUICKWINDOWMODULE_H #define QQUICKWINDOWMODULE_H -#include <qqml.h> +#include <private/qtquickglobal_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -class QQuickWindowModule +class Q_QUICK_PRIVATE_EXPORT QQuickWindowModule { public: static void defineModule(); diff --git a/src/quick/particles/qquickparticlesmodule_p.h b/src/quick/particles/qquickparticlesmodule_p.h index b7cf09919e..23a40488cf 100644 --- a/src/quick/particles/qquickparticlesmodule_p.h +++ b/src/quick/particles/qquickparticlesmodule_p.h @@ -39,16 +39,16 @@ ** ****************************************************************************/ -#ifndef QQuickPARTICLESMODULE_H -#define QQuickPARTICLESMODULE_H +#ifndef QQUICKPARTICLESMODULE_H +#define QQUICKPARTICLESMODULE_H -#include <qqml.h> +#include <private/qtquickglobal_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -class QQuickParticlesModule +class Q_QUICK_PRIVATE_EXPORT QQuickParticlesModule { public: static void defineModule(); @@ -58,4 +58,4 @@ QT_END_NAMESPACE QT_END_HEADER -#endif // QQuickPARTICLESMODULE_H +#endif // QQUICKPARTICLESMODULE_H diff --git a/src/quick/qtquick2.cpp b/src/quick/qtquick2.cpp index a97dade106..3e04a12d58 100644 --- a/src/quick/qtquick2.cpp +++ b/src/quick/qtquick2.cpp @@ -44,8 +44,6 @@ #include <private/qquickutilmodule_p.h> #include <private/qqmlvaluetype_p.h> #include <private/qquickitemsmodule_p.h> -#include <private/qquickparticlesmodule_p.h> -#include <private/qquickwindowmodule_p.h> #include <private/qqmlenginedebugservice_p.h> #include <private/qqmldebugstatesdelegate_p.h> @@ -175,8 +173,6 @@ void QQmlQtQuick2Module::defineModule() QQuickUtilModule::defineModule(); QQmlEnginePrivate::defineModule(); QQuickItemsModule::defineModule(); - QQuickParticlesModule::defineModule(); - QQuickWindowModule::defineModule(); QQmlValueTypeFactory::registerValueTypes(); if (QQmlEngineDebugService::isDebuggingEnabled()) { |