diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-09-29 10:06:36 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-09-29 10:06:36 (GMT) |
| commit | a5cf78de2c7542ee64756f2bb894b56933e6d184 (patch) | |
| tree | 0421f9ca2d7caeb28386fa1208c4b4e9595296b4 /src | |
| parent | dc8d0961a50e28224dc36febb3530c47444f8638 (diff) | |
| parent | e28b1810ba5979dcf2146f9389007b4cfd67a31c (diff) | |
| download | Qt-a5cf78de2c7542ee64756f2bb894b56933e6d184.zip Qt-a5cf78de2c7542ee64756f2bb894b56933e6d184.tar.gz Qt-a5cf78de2c7542ee64756f2bb894b56933e6d184.tar.bz2 | |
Merge remote branch 'lighthouse/4.7' into lighthouse-master
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/directfb/qdirectfbintegration.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/platforms.pro | 17 |
2 files changed, 2 insertions, 17 deletions
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 -} |