Attachment #495212 for bug #572824




- In webpage, don't inherit QWebFrame::PrintCallback since it's not public
++ b/src/webpage.cpp

    }

    printer.setPageMargins(marginLeft, marginTop, marginRight, marginBottom, QPrinter::Point);

    m_mainFrame->print(&printer);
    return true;
}

void WebPage::setZoomFactor(qreal zoom)
++ b/src/webpage.h

class NetworkAccessManager;
class QWebInspector;
class Phantom;

class WebPage : public QObject
{
    Q_OBJECT
    Q_PROPERTY(QString title READ title)
    Q_PROPERTY(QString frameTitle READ frameTitle)

Return to bug 572824

Line Link Here

(-)file_not_specified_in_diff (-4 / +4 lines)
	- In webpage, don't inherit QWebFrame::PrintCallback since it's not public		- In webpage, don't inherit QWebFrame::PrintCallback since it's not public
1	-- a/src/webpage.cpp	1	++ b/src/webpage.cpp
Lines 1254-1262 Link Here
1254	}	1254	}
1255		1255
1256	printer.setPageMargins(marginLeft, marginTop, marginRight, marginBottom, QPrinter::Point);	1256	printer.setPageMargins(marginLeft, marginTop, marginRight, marginBottom, QPrinter::Point);
1257		1257
1258	m_mainFrame->print(&printer, this);	1258	m_mainFrame->print(&printer);
1259	return true;	1259	return true;
1260	}	1260	}
1261		1261
1262	void WebPage::setZoomFactor(qreal zoom)	1262	void WebPage::setZoomFactor(qreal zoom)
1263	-- a/src/webpage.h	1263	++ b/src/webpage.h
Lines 44-52 Link Here
44	class NetworkAccessManager;	44	class NetworkAccessManager;
45	class QWebInspector;	45	class QWebInspector;
46	class Phantom;	46	class Phantom;
47		47
48	class WebPage : public QObject, public QWebFrame::PrintCallback	48	class WebPage : public QObject
49	{	49	{
50	Q_OBJECT	50	Q_OBJECT
51	Q_PROPERTY(QString title READ title)	51	Q_PROPERTY(QString title READ title)
52	Q_PROPERTY(QString frameTitle READ frameTitle)	52	Q_PROPERTY(QString frameTitle READ frameTitle)