diff options
| author | Robin Burchell <robin.burchell@collabora.com> | 2011-10-27 10:58:57 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-28 16:29:13 +0200 |
| commit | a2337f79ffd229aa1e91f6bfec6294570eb3fe44 (patch) | |
| tree | 48d68ba1c19bb629a096344453cf69cd692affba /tests/auto/gui/image/qpixmap | |
| parent | 1cae2fdb864f2b67333a7c80742b8e493865b3f9 (diff) | |
Remove Windows and X11 from src/widgets/platforms.
This is dead code, unused with QPA in place, so remove it to avoid confusion
caused through grepping for class names existing in both old and new places.
Mac code is left in place for now, as some of it is still in use.
Change-Id: Ia82cd5bbabe71285ca997f79d8fd9c0504e32c28
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'tests/auto/gui/image/qpixmap')
| -rw-r--r-- | tests/auto/gui/image/qpixmap/tst_qpixmap.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp index 98b8570b12..4be8a40547 100644 --- a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp @@ -65,10 +65,6 @@ #include <qscreen_qws.h> #endif -#ifdef Q_WS_X11 -#include <QX11Info> -#endif - //TESTED_CLASS= //TESTED_FILES= @@ -180,10 +176,8 @@ static bool lenientCompare(const QPixmap &actual, const QPixmap &expected) int size = actual.width() * actual.height(); int threshold = 2; -#ifdef Q_WS_X11 - if (QX11Info::appDepth() == 16) + if (QPixmap::defaultDepth() == 16) threshold = 10; -#endif QRgb *a = (QRgb *)actualImage.bits(); QRgb *e = (QRgb *)expectedImage.bits(); @@ -245,10 +239,8 @@ void tst_QPixmap::swap() void tst_QPixmap::fromImage_data() { bool is16bit = false; -#ifdef Q_WS_X11 - if (QX11Info::appDepth() == 16) + if (QPixmap::defaultDepth() == 16) is16bit = true; -#endif QTest::addColumn<QImage::Format>("format"); |