From 18e35b4764766ef8171ec30b00d0d6bc19edb0ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@nokia.com>
Date: Thu, 16 Sep 2010 10:15:08 +0200
Subject: Lighthouse: Remove auto building platform plugins

Reviewed-by: paul
---
 configure                           |  6 ------
 src/plugins/platforms/platforms.pro | 17 +----------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/configure b/configure
index d252f51..0723af1 100755
--- a/configure
+++ b/configure
@@ -6116,12 +6116,6 @@ if [ "$PLATFORM_QPA" = "yes" ]; then
         fi
     fi
 
-    # MIT_SHM is required for testlite
-    if [ "$CFG_MITSHM" != "no" ]; then
-	if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/mitshm "mitshm" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
-            QT_CONFIG="$QT_CONFIG mitshm"
-	fi
-    fi
 fi
 
 
diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro
index 3446e81..26ccd44 100644
--- a/src/plugins/platforms/platforms.pro
+++ b/src/plugins/platforms/platforms.pro
@@ -1,19 +1,4 @@
 TEMPLATE = subdirs
-contains(QT_CONFIG, openvg):contains(QT_CONFIG, egl) {
-    SUBDIRS += openvglite
-}
 
-    SUBDIRS += minimal
+SUBDIRS += minimal
 
-contains(QT_CONFIG, mitshm) {
-    SUBDIRS += testlite
-}
-
-linux {
-    SUBDIRS += linuxfb
-}
-
-unix {
-    SUBDIRS +=  vnc \
-                qvfb
-}
-- 
cgit v0.12


From e28b1810ba5979dcf2146f9389007b4cfd67a31c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@nokia.com>
Date: Thu, 16 Sep 2010 12:45:26 +0200
Subject: Lighthouse: fix QDirectFbScreen::depth to not be fixed to 32

---
 src/plugins/platforms/directfb/qdirectfbintegration.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.cpp b/src/plugins/platforms/directfb/qdirectfbintegration.cpp
index 64b98db..1b3e035 100644
--- a/src/plugins/platforms/directfb/qdirectfbintegration.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbintegration.cpp
@@ -71,7 +71,7 @@ QDirectFbScreen::QDirectFbScreen(int display)
     m_geometry = QRect(0,0,config.width,config.height);
     const int dpi = 72;
     const qreal inch = 25.4;
-    m_depth = 32;
+    m_depth = QDirectFbConvenience::colorDepthForSurface(config.pixelformat);
     m_physicalSize = QSize(qRound(config.width * inch / dpi), qRound(config.height *inch / dpi));
 
     cursor = new QDirectFBCursor(this);
-- 
cgit v0.12