diff options
| author | Liang Qi <liang.qi@nokia.com> | 2010-05-25 15:49:43 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2010-05-25 15:52:13 (GMT) |
| commit | 70ae881499ec329e6fdf96d56a6189f77641b3b0 (patch) | |
| tree | 93e194af5fa4fc250f323cab416a24c091b90b24 | |
| parent | 88abca461b554628b3deb47f2b379f5a36c62f30 (diff) | |
| download | Qt-70ae881499ec329e6fdf96d56a6189f77641b3b0.zip Qt-70ae881499ec329e6fdf96d56a6189f77641b3b0.tar.gz Qt-70ae881499ec329e6fdf96d56a6189f77641b3b0.tar.bz2 | |
Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian.
| -rw-r--r-- | tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp | 8 | ||||
| -rw-r--r-- | tests/auto/qprinter/tst_qprinter.cpp | 11 |
2 files changed, 17 insertions, 2 deletions
diff --git a/tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp b/tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp index 15f427c..0700e9e 100644 --- a/tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp +++ b/tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp @@ -50,6 +50,8 @@ //TESTED_CLASS= //TESTED_FILES= +#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) + class tst_QAbstractPrintDialog : public QObject { Q_OBJECT @@ -141,3 +143,9 @@ void tst_QAbstractPrintDialog::setFromTo() QTEST_MAIN(tst_QAbstractPrintDialog) #include "tst_qabstractprintdialog.moc" + +#else + +QTEST_NOOP_MAIN + +#endif 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 |