From 8afc0676471b4802884ca7ee78d0097f1e5b5646 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu, 20 Oct 2011 13:35:27 +0200
Subject: QtGui: Remove Q_WS and qpa.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Enable compilation without -qpa.
Remove QT_NO_FREETYPE and QT_NO_FONTCONFIG when building.

Change-Id: I0e017cc47ee06b885be65deaeb67a449a119b8be
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/gui/egl/egl.pri                 | 24 +++++++++---------------
 src/gui/egl/qegl_stub.cpp           |  1 -
 src/gui/egl/qeglproperties_stub.cpp |  7 -------
 3 files changed, 9 insertions(+), 23 deletions(-)

(limited to 'src/gui/egl')

diff --git a/src/gui/egl/egl.pri b/src/gui/egl/egl.pri
index ec23da3312..b13c43e371 100644
--- a/src/gui/egl/egl.pri
+++ b/src/gui/egl/egl.pri
@@ -24,19 +24,13 @@ contains(QT_CONFIG, egl): {
 
 	wince*: SOURCES += egl/qegl_wince.cpp
 
-	unix {
-            qpa {
-                SOURCES += egl/qegl_qpa.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
+        symbian {
+            SOURCES += egl/qegl_symbian.cpp
+        } else {
+             SOURCES += egl/qegl_qpa.cpp
+        }
+} else:symbian: {
+    DEFINES += QT_NO_EGL
+    SOURCES += egl/qegl_stub.cpp
+    SOURCES += egl/qeglproperties_stub.cpp
 }
diff --git a/src/gui/egl/qegl_stub.cpp b/src/gui/egl/qegl_stub.cpp
index b86f4dc2c0..783393c148 100644
--- a/src/gui/egl/qegl_stub.cpp
+++ b/src/gui/egl/qegl_stub.cpp
@@ -41,7 +41,6 @@
 
 #include <QtGui/qpaintdevice.h>
 #include <QtGui/qpixmap.h>
-#include <QtGui/qwidget.h>
 #include <QtCore/qdebug.h>
 
 #include "qegl_p.h"
diff --git a/src/gui/egl/qeglproperties_stub.cpp b/src/gui/egl/qeglproperties_stub.cpp
index c129266e46..c04f6a1070 100644
--- a/src/gui/egl/qeglproperties_stub.cpp
+++ b/src/gui/egl/qeglproperties_stub.cpp
@@ -123,13 +123,6 @@ bool QEglProperties::reduceConfiguration()
     return false;
 }
 
-static void addTag(QString& str, const QString& tag)
-{
-    Q_UNUSED(str)
-    Q_UNUSED(tag)
-    NOEGL
-}
-
 // Convert a property list to a string suitable for debug output.
 QString QEglProperties::toString() const
 {
-- 
cgit v1.2.3