Index: qt-x11-opensource-src-4.4.1-snapshot-20080328/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp =================================================================== --- qt-x11-opensource-src-4.4.1-snapshot-20080328.orig/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp 2008-03-28 22:10:48.000000000 +0800 +++ qt-x11-opensource-src-4.4.1-snapshot-20080328/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp 2008-03-28 22:11:46.000000000 +0800 @@ -655,6 +655,7 @@ return QObject::event(e); } +#ifndef QT_NO_PRINTER /*! Prints the frame to the given \a printer. */ @@ -740,6 +741,7 @@ printContext.end(); } +#endif /*! Evaluate JavaScript defined by \a scriptSource using this frame as context. Index: qt-x11-opensource-src-4.4.1-snapshot-20080328/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.h =================================================================== --- qt-x11-opensource-src-4.4.1-snapshot-20080328.orig/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.h 2008-03-28 22:11:49.000000000 +0800 +++ qt-x11-opensource-src-4.4.1-snapshot-20080328/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.h 2008-03-28 22:12:02.000000000 +0800 @@ -160,7 +160,9 @@ public Q_SLOTS: QVariant evaluateJavaScript(const QString& scriptSource); +#ifndef QT_NO_PRINTER void print(QPrinter *printer) const; +#endif Q_SIGNALS: void javaScriptWindowObjectCleared(); Index: qt-x11-opensource-src-4.4.1-snapshot-20080328/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp =================================================================== --- qt-x11-opensource-src-4.4.1-snapshot-20080328.orig/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp 2008-03-28 22:19:11.000000000 +0800 +++ qt-x11-opensource-src-4.4.1-snapshot-20080328/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp 2008-03-28 22:19:53.000000000 +0800 @@ -389,6 +389,7 @@ return QWidget::event(e); } +#ifndef QT_NO_PRINTER /*! Prints the main frame to the given \a printer. */ @@ -396,6 +397,7 @@ { page()->mainFrame()->print(printer); } +#endif /*! Convenience slot that stops loading the document. Index: qt-x11-opensource-src-4.4.1-snapshot-20080328/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h =================================================================== --- qt-x11-opensource-src-4.4.1-snapshot-20080328.orig/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h 2008-03-28 22:19:55.000000000 +0800 +++ qt-x11-opensource-src-4.4.1-snapshot-20080328/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h 2008-03-28 22:20:04.000000000 +0800 @@ -106,7 +106,9 @@ void forward(); void reload(); +#ifndef QT_NO_PRINTER void print(QPrinter *printer) const; +#endif Q_SIGNALS: void loadStarted(); Index: qt-x11-opensource-src-4.4.1-snapshot-20080328/src/3rdparty/webkit/WebKit/qt/QtLauncher/main.cpp =================================================================== --- qt-x11-opensource-src-4.4.1-snapshot-20080328.orig/src/3rdparty/webkit/WebKit/qt/QtLauncher/main.cpp 2008-03-28 22:28:15.000000000 +0800 +++ qt-x11-opensource-src-4.4.1-snapshot-20080328/src/3rdparty/webkit/WebKit/qt/QtLauncher/main.cpp 2008-03-28 22:32:53.000000000 +0800 @@ -35,10 +35,11 @@ #include #include +#ifndef QT_NO_PRINTER #if QT_VERSION >= 0x040400 #include #endif - +#endif class InfoWidget :public QProgressBar { Q_OBJECT @@ -328,10 +329,12 @@ bar->addAction(view->pageAction(QWebPage::Undo)); bar->addAction(view->pageAction(QWebPage::Redo)); +#ifndef QT_NO_PRINTER #if QT_VERSION >= 0x040400 bar->addSeparator(); bar->addAction(tr("Print"), this, SLOT(print())); #endif +#endif addToolBarBreak(); bar = addToolBar("Location"); @@ -370,12 +373,14 @@ } void print() { +#ifndef QT_NO_PRINTER #if QT_VERSION >= 0x040400 QPrintPreviewDialog dlg(this); connect(&dlg, SIGNAL(paintRequested(QPrinter *)), view, SLOT(print(QPrinter *))); dlg.exec(); #endif +#endif } protected: void resizeEvent(QResizeEvent *) {