summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2012-10-26 12:51:03 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-27 00:24:16 +0200
commit67a0f546c507d4113de895df297815adcb5d489e (patch)
tree8e46e888e3d9af4708671ae26763b32ec1b7307b /tests/auto/gui
parentd9984697401460c64d1a49838b61a298f291b9dd (diff)
test: Remove dead code from tst_QPixmap
Change-Id: I1945a0f431364f47a43cf7f600ad38fdba5f4a08 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'tests/auto/gui')
-rw-r--r--tests/auto/gui/image/qpixmap/tst_qpixmap.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
index 1918841d24..6a7ce66bd7 100644
--- a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
@@ -439,12 +439,7 @@ void tst_QPixmap::fill_data()
QTest::newRow(QString("syscolor_%1").arg(color).toLatin1())
<< uint(color) << true << false;
-#ifdef Q_WS_QWS
- if (QScreen::instance()->depth() >= 24) {
-#elif defined (Q_WS_X11)
- QPixmap pm(1, 1);
- if (pm.x11PictureHandle()) {
-#elif defined (Q_OS_WINCE)
+#if defined (Q_OS_WINCE)
QPixmap pixmap(1,1);
if (QApplication::desktop()->grab().depth() >= 24) {
#else