summaryrefslogtreecommitdiffstats
path: root/tests/auto/qprinter/tst_qprinter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qprinter/tst_qprinter.cpp')
-rw-r--r--tests/auto/qprinter/tst_qprinter.cpp25
1 files changed, 2 insertions, 23 deletions
diff --git a/tests/auto/qprinter/tst_qprinter.cpp b/tests/auto/qprinter/tst_qprinter.cpp
index 96765a478e..b1c4c4ee3c 100644
--- a/tests/auto/qprinter/tst_qprinter.cpp
+++ b/tests/auto/qprinter/tst_qprinter.cpp
@@ -39,19 +39,13 @@
**
****************************************************************************/
-
#include <QtTest/QtTest>
-
-
#include <qprinter.h>
#include <qpagesetupdialog.h>
#include <qpainter.h>
#include <qprintdialog.h>
#include <qprinterinfo.h>
-#ifdef QT3_SUPPORT
-#include <q3paintdevicemetrics.h>
-#endif
#include <qvariant.h>
#include <qpainter.h>
#include <qprintengine.h>
@@ -412,6 +406,8 @@ void tst_QPrinter::testMargins()
QFETCH(int, width);
QFETCH(int, height);
QFETCH(bool, fullpage);
+ Q_UNUSED(width);
+ Q_UNUSED(height);
QPrinter printer;
QPainter *painter = 0;
printer.setOutputFileName("silly");
@@ -421,23 +417,6 @@ void tst_QPrinter::testMargins()
if (withPainter)
painter = new QPainter(&printer);
-#ifdef QT3_SUPPORT
- Q3PaintDeviceMetrics metrics(&printer);
- int pwidth = metrics.width();
- int pheight = metrics.height();
-
- if (orientation == QPrinter::Portrait) {
- QVERIFY(pheight >= pwidth);
- } else {
- QVERIFY(pwidth >= pheight);
- }
-
- if (fullpage) {
- QCOMPARE(metrics.widthMM(), width);
- QCOMPARE(metrics.heightMM(), height);
- }
-#endif
-
if (painter)
delete painter;
}