diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-11 14:56:22 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-04-11 16:05:03 +0200 |
| commit | a896d4b39ec3d45ba708d9b36ea9c864b1df2136 (patch) | |
| tree | 45cfe153cce6114c2c76c48dc0bdabde2a8cf3e3 /src/quick/qtquick2.cpp | |
| parent | 24fb8dc27eddfdd62bd2c3a6e863cbf433762cd6 (diff) | |
| parent | 65bfc35429e845cf6b76d58107360a1360a654fc (diff) | |
Merge remote-tracking branch 'origin/master' into api_changes
Conflicts:
src/qml/debugger/qqmlprofilerservice_p.h
src/qml/qml/qqmlboundsignal.cpp
src/qml/qml/v4/qv4bindings.cpp
src/quick/items/qquickshadereffect.cpp
src/quick/particles/qquickcustomparticle.cpp
src/quick/qtquick2.cpp
Change-Id: Ia9c6517035ae912fa75e77473a452bd3383def56
Diffstat (limited to 'src/quick/qtquick2.cpp')
| -rw-r--r-- | src/quick/qtquick2.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/quick/qtquick2.cpp b/src/quick/qtquick2.cpp index 16cf2198a2..8a0c05618a 100644 --- a/src/quick/qtquick2.cpp +++ b/src/quick/qtquick2.cpp @@ -44,14 +44,12 @@ #include <private/qquickutilmodule_p.h> #include <private/qquickvaluetypes_p.h> #include <private/qquickitemsmodule_p.h> -#include <private/qquickparticlesmodule_p.h> -#include <private/qquickwindowmodule_p.h> -#include <private/qquickapplication_p.h> #include <private/qqmlenginedebugservice_p.h> #include <private/qqmldebugstatesdelegate_p.h> #include <private/qqmlbinding_p.h> #include <private/qqmlcontext_p.h> +#include <private/qquickapplication_p.h> #include <QtQuick/private/qquickpropertychanges_p.h> #include <QtQuick/private/qquickstate_p.h> #include <qqmlproperty.h> @@ -176,8 +174,6 @@ void QQmlQtQuick2Module::defineModule() QQuickUtilModule::defineModule(); QQmlEnginePrivate::defineModule(); QQuickItemsModule::defineModule(); - QQuickParticlesModule::defineModule(); - QQuickWindowModule::defineModule(); qmlRegisterUncreatableType<QQuickApplication>("QtQuick",2,0,"Application", QQuickApplication::tr("Application is an abstract class")); |