diff options
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | src/plugins/platforms/directfb/qdirectfbintegration.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/platforms.pro | 17 |
3 files changed, 2 insertions, 23 deletions
@@ -6156,12 +6156,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/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); 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 -} |