Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
	configure.exe
	examples/multimedia/audioinput/audioinput.cpp
	src/corelib/io/qfsfileengine.cpp
	src/gui/egl/qegl_wince.cpp
	src/gui/egl/qeglproperties.cpp
	src/gui/egl/qeglproperties_p.h
	src/gui/embedded/directfb.pri
	src/gui/kernel/qapplication_win.cpp
	src/gui/painting/qdrawutil.cpp
	src/opengl/qgl_p.h
	src/sql/drivers/odbc/qsql_odbc.cpp
	src/sql/drivers/odbc/qsql_odbc.h
	tests/auto/auto.pro
	tests/auto/qgl/tst_qgl.cpp
	translations/assistant_adp_ru.ts

2 files changed, 9 insertions, 4 deletions

diff --git a/tests/auto/qgl/qgl.pro b/tests/auto/qgl/qgl.pro
index 9116f39..5f058f9 100644
--- a/tests/auto/qgl/qgl.pro
+++ b/tests/auto/qgl/qgl.pro
@@ -6,6 +6,8 @@ load(qttest_p4)
 requires(contains(QT_CONFIG,opengl))
 QT += opengl
 
+contains(QT_CONFIG,egl):DEFINES += QGL_EGL
+
 SOURCES   += tst_qgl.cpp
 RESOURCES  = qgl.qrc
 
diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp
index 6ffe2a7..d89e463 100644
--- a/tests/auto/qgl/tst_qgl.cpp
+++ b/tests/auto/qgl/tst_qgl.cpp
@@ -1073,8 +1073,7 @@ void tst_QGL::glFBOSimpleRendering()
     QGLFramebufferObjectFormat fboFormat;
     fboFormat.setAttachment(QGLFramebufferObject::NoAttachment);
 
-    // Don't complicate things by using NPOT:
-    QGLFramebufferObject *fbo = new QGLFramebufferObject(256, 128, fboFormat);
+    QGLFramebufferObject *fbo = new QGLFramebufferObject(200, 100, fboFormat);
 
     fbo->bind();
 
@@ -1266,7 +1265,7 @@ protected:
         widgetPainterBeginOk = widgetPainter.begin(this);
         QGLFramebufferObjectFormat fboFormat;
         fboFormat.setAttachment(QGLFramebufferObject::NoAttachment);
-        QGLFramebufferObject *fbo = new QGLFramebufferObject(128, 128, fboFormat);
+        QGLFramebufferObject *fbo = new QGLFramebufferObject(100, 100, fboFormat);
 
         QPainter fboPainter;
         fboPainterBeginOk = fboPainter.begin(fbo);
@@ -1290,7 +1289,7 @@ void tst_QGL::glFBOUseInGLWidget()
 #ifdef Q_WS_QWS
     w.setWindowFlags(Qt::FramelessWindowHint);
 #endif
-    w.resize(128, 128);
+    w.resize(100, 100);
     w.show();
 
 #ifdef Q_WS_X11
@@ -1402,6 +1401,10 @@ void tst_QGL::glWidgetRenderPixmap()
     QImage reference(fb.size(), QImage::Format_RGB32);
     reference.fill(0xffff0000);
 
+#ifdef QGL_EGL
+    QSKIP("renderPixmap() not yet supported under EGL", SkipAll);
+#endif
+
     QFUZZY_COMPARE_IMAGES(fb, reference);
 }