diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-20 19:45:38 +0200 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-20 19:46:19 +0200 |
commit | d671acd5b296b83440db9836a92189c501c87ff3 (patch) | |
tree | bd9c1a000e17c70124c207666cfb3276b5518ffd /tests/auto/qimage/tst_qimage.cpp | |
parent | 42f5786104f9eef9542df2c7469a03324978281d (diff) | |
parent | 4f2138ecfbdc58e5cb5b0c7d762197ef69752957 (diff) |
Merge remote branch 'staging/master' into refactor
Conflicts:
src/opengl/qgl_qpa.cpp
src/plugins/platforms/glxconvenience/qglxconvenience.cpp
src/plugins/platforms/platforms.pro
src/plugins/platforms/wayland/qwaylandwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.h
src/plugins/platforms/xcb/qxcbwindowsurface.cpp
src/widgets/kernel/qwidget_qpa.cpp
tests/auto/qvariant/tst_qvariant.cpp
Diffstat (limited to 'tests/auto/qimage/tst_qimage.cpp')
-rw-r--r-- | tests/auto/qimage/tst_qimage.cpp | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/tests/auto/qimage/tst_qimage.cpp b/tests/auto/qimage/tst_qimage.cpp index ad85bf5cce..49acb98a6a 100644 --- a/tests/auto/qimage/tst_qimage.cpp +++ b/tests/auto/qimage/tst_qimage.cpp @@ -73,7 +73,6 @@ private slots: void create(); void createInvalidXPM(); void createFromUChar(); - void convertBitOrder(); void formatHandlersInput_data(); void formatHandlersInput(); @@ -265,32 +264,6 @@ void tst_QImage::createFromUChar() QCOMPARE(i4.pixel(0,0), 6U); } -void tst_QImage::convertBitOrder() -{ -#if !defined(QT3_SUPPORT) - QSKIP("Qt compiled without Qt3Support", SkipAll); -#else - QImage i(9,5,1,2,QImage::LittleEndian); - qMemSet(i.bits(), 0, i.byteCount()); - - i.setDotsPerMeterX(9); - i.setDotsPerMeterY(5); - i.fill(0x12345678); - QVERIFY(!i.isNull()); - - QImage ni = i.convertBitOrder(QImage::BigEndian); - QVERIFY(!ni.isNull()); - QVERIFY(ni.bitOrder() == QImage::BigEndian); - - // A bunch of verifies to make sure that nothing was lost - QVERIFY(i.dotsPerMeterX() == ni.dotsPerMeterX()); - QVERIFY(i.dotsPerMeterY() == ni.dotsPerMeterY()); - QVERIFY(i.depth() == ni.depth()); - QVERIFY(i.size() == ni.size()); - QVERIFY(i.colorCount() == ni.colorCount()); -#endif -} - void tst_QImage::formatHandlersInput_data() { QTest::addColumn<QString>("testFormat"); |