diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-27 23:05:41 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-27 23:06:01 (GMT) |
| commit | 85fa83ac89367bf4f3a85d038ef64a362aa8377e (patch) | |
| tree | 706bc6aa64be436480d0d6a0c5603ff31186bfbb /tests/auto/qprinter | |
| parent | 103e1e8ea5e8879f2bb97e008840a212b3004a51 (diff) | |
| parent | 8f011df08139bea59c12ae0804969334a9374dc8 (diff) | |
| download | Qt-85fa83ac89367bf4f3a85d038ef64a362aa8377e.zip Qt-85fa83ac89367bf4f3a85d038ef64a362aa8377e.tar.gz Qt-85fa83ac89367bf4f3a85d038ef64a362aa8377e.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
demos/spectrum/app/engine.h
demos/spectrum/app/mainwidget.h
demos/spectrum/app/settingsdialog.h
demos/spectrum/app/spectrograph.h
demos/spectrum/app/spectrumanalyser.h
demos/spectrum/app/tonegenerator.h
demos/spectrum/app/tonegeneratordialog.h
demos/spectrum/app/utils.h
demos/spectrum/app/waveform.h
tests/auto/qtextcodec/tst_qtextcodec.cpp
Diffstat (limited to 'tests/auto/qprinter')
| -rw-r--r-- | tests/auto/qprinter/tst_qprinter.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tests/auto/qprinter/tst_qprinter.cpp b/tests/auto/qprinter/tst_qprinter.cpp index 8b79533..e908961 100644 --- a/tests/auto/qprinter/tst_qprinter.cpp +++ b/tests/auto/qprinter/tst_qprinter.cpp @@ -64,11 +64,13 @@ Q_DECLARE_METATYPE(QRect) - +QT_FORWARD_DECLARE_CLASS(QPrinter) //TESTED_CLASS= //TESTED_FILES= +#ifndef QT_NO_PRINTER + class tst_QPrinter : public QObject { Q_OBJECT @@ -217,7 +219,6 @@ tst_QPrinter::tst_QPrinter() tst_QPrinter::~tst_QPrinter() { - } // initTestCase will be executed once before the first testfunction is executed. @@ -1056,3 +1057,9 @@ void tst_QPrinter::testPdfTitle() QTEST_MAIN(tst_QPrinter) #include "tst_qprinter.moc" + +#else //QT_NO_PRINTER + +QTEST_NOOP_MAIN + +#endif //QT_NO_PRINTER |