Fix rename of the define QT_COMPOSITOR_DECLARATIVE to QT_..._QUICK
authorJørgen <jorgen.lind@nokia.com>
Tue, 3 Jan 2012 09:33:28 +0000 (10:33 +0100)
committerJørgen Lind <jorgen.lind@nokia.com>
Wed, 4 Jan 2012 09:33:42 +0000 (10:33 +0100)
Change-Id: I4bcc5466711a3cfcc10812d519555a7b604dffb1
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
src/compositor/compositor_api/waylandcompositor.cpp

index 0e90f23..3f84f7c 100644 (file)
@@ -47,7 +47,7 @@
 
 #include <QDebug>
 
-#ifdef QT_COMPOSITOR_DECLARATIVE
+#ifdef QT_COMPOSITOR_QUICK
 #include "waylandsurfaceitem.h"
 #endif
 
@@ -63,7 +63,7 @@ WaylandCompositor::WaylandCompositor(QWindow *window, const char *socketName)
         m_socket_name = arguments.at(socketArg + 1).toLocal8Bit();
 
     m_compositor = new Wayland::Compositor(this);
-#ifdef QT_COMPOSITOR_DECLARATIVE
+#ifdef QT_COMPOSITOR_QUICK
     qmlRegisterType<WaylandSurfaceItem>("WaylandCompositor", 1, 0, "WaylandSurfaceItem");
     qRegisterMetaType<WaylandSurface*>("WaylandSurface*");
 #endif