From dd91e772430dc294e3bf478c119ef8d43c0a3358 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Mon, 12 Mar 2012 14:11:15 +0100
Subject: Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a
 (http://svn.webkit.org/repository/webkit/trunk@110422)

This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API.
---
 Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp')

diff --git a/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp b/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp
index 031c3fa6a..92eb40855 100644
--- a/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp
@@ -34,7 +34,7 @@
 #endif
 #endif
 
-#if PLATFORM(QT) && USE(TEXTURE_MAPPER)
+#if PLATFORM(QT)
 #include "qt/LayerTreeHostQt.h"
 #endif
 
@@ -48,7 +48,7 @@ PassRefPtr<LayerTreeHost> LayerTreeHost::create(WebPage* webPage)
     return LayerTreeHostCAMac::create(webPage);
 #elif PLATFORM(WIN) && HAVE(WKQCA)
     return LayerTreeHostCAWin::create(webPage);
-#elif PLATFORM(QT) && USE(TEXTURE_MAPPER)
+#elif PLATFORM(QT)
     return LayerTreeHostQt::create(webPage);
 #else
     return 0;
-- 
cgit v1.2.1