Merge remote branch 'qt/4.7' into lighthouse-4.7

Conflicts:
	src/gui/egl/egl.pri
	src/gui/painting/qwindowsurface_p.h

1 files changed, 29 insertions, 23 deletions

diff --git a/src/gui/egl/egl.pri b/src/gui/egl/egl.pri
index 47032d5..595d135 100644
--- a/src/gui/egl/egl.pri
+++ b/src/gui/egl/egl.pri
@@ -1,28 +1,34 @@
-CONFIG += egl
+contains(QT_CONFIG, egl): {
+	CONFIG += egl
 
-HEADERS += \
-    egl/qegl_p.h \
-    egl/qeglcontext_p.h \
-    egl/qeglproperties_p.h
+	HEADERS += \
+	    egl/qegl_p.h \
+	    egl/qeglcontext_p.h \
+	    egl/qeglproperties_p.h
 
-SOURCES += \
-    egl/qegl.cpp \
-    egl/qeglproperties.cpp
+	SOURCES += \
+	    egl/qegl.cpp \
+	    egl/qeglproperties.cpp
 
-wince*: SOURCES += egl/qegl_wince.cpp
+	wince*: SOURCES += egl/qegl_wince.cpp
 
-unix {
-    embedded {
-        SOURCES += egl/qegl_qws.cpp
-    } else {
-        embedded_lite {
-            SOURCES += egl/qegl_lite.cpp
-        } else {
-            symbian {
-                SOURCES += egl/qegl_symbian.cpp
-            } else {
-                SOURCES += egl/qegl_x11.cpp
-            }
-        }
-    }
+	unix {
+	    embedded {
+	        SOURCES += egl/qegl_qws.cpp
+	    } else {
+	        embedded_lite {
+	            SOURCES += egl/qegl_lite.cpp
+	        } else {
+	            symbian {
+	                SOURCES += egl/qegl_symbian.cpp
+	            } else {
+	                SOURCES += egl/qegl_x11.cpp
+	            }
+	        }
+	    }
+	}
+} else:symbian {
+	DEFINES += QT_NO_EGL
+	SOURCES += egl/qegl_stub.cpp
+	SOURCES += egl/qeglproperties_stub.cpp
 }