diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-03-20 19:12:06 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-25 16:01:29 +0100 |
| commit | 64956e77c8b71922df32b0925200940fcb969604 (patch) | |
| tree | def1ef981c2857b17f9e08b8dfb7bcd2007abc7e | |
| parent | 1a26da32559ceffa89003bcd5372419f27e8d847 (diff) | |
| download | qtwebkit-examples-64956e77c8b71922df32b0925200940fcb969604.tar.gz | |
The QT_NO_PRINTER guard is too generic if QPrintDialog is disabled
Use QT_NO_PRINTDIALOG and QT_NO_PRINTPREVIEWDIALOG instead of
QT_NO_PRINTER to guard QPrintDialog and QPrintPreviewDialog
respectively to fix the build if printing is enabled but
dialogs are not.
Change-Id: I7c083c32b1ff0d2ea0793873533d184c067f01cd
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
| -rw-r--r-- | examples/webkitwidgets/browser/browsermainwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/webkitwidgets/browser/browsermainwindow.cpp b/examples/webkitwidgets/browser/browsermainwindow.cpp index ad9dc52..b94cb25 100644 --- a/examples/webkitwidgets/browser/browsermainwindow.cpp +++ b/examples/webkitwidgets/browser/browsermainwindow.cpp @@ -630,7 +630,7 @@ void BrowserMainWindow::slotFileOpen() void BrowserMainWindow::slotFilePrintPreview() { -#ifndef QT_NO_PRINTER +#ifndef QT_NO_PRINTPREVIEWDIALOG if (!currentTab()) return; QPrintPreviewDialog *dialog = new QPrintPreviewDialog(this); @@ -649,7 +649,7 @@ void BrowserMainWindow::slotFilePrint() void BrowserMainWindow::printRequested(QWebFrame *frame) { -#ifndef QT_NO_PRINTER +#ifndef QT_NO_PRINTDIALOG QPrinter printer; QPrintDialog *dialog = new QPrintDialog(&printer, this); dialog->setWindowTitle(tr("Print Document")); |