diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2012-11-08 15:55:21 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-23 11:34:39 +0100 |
| commit | e38ee135f3cf74f413dc7a3e4a9f97a6b5d903bf (patch) | |
| tree | a536ab6781f7ab5f9041c9b57ee95b45b2601a29 /src | |
| parent | 7727e207563ecf640fd8a9a0a6163a3886a6f57d (diff) | |
Backport helpviewer_qwv.cpp fixes from QtCreator bugs 7199 and 8211.
Corrected setup for HelpNetworkReply and changed uses of TextSizeMulti-
plier to use ZoomFactor.
Task-number: QTBUG-27899
modified: src/assistant/assistant/helpviewer_qwv.cpp
Change-Id: I1d0a4052abb978dc26bd1c0b94a420faf8209fa4
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/assistant/assistant/helpviewer_qwv.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/assistant/assistant/helpviewer_qwv.cpp b/src/assistant/assistant/helpviewer_qwv.cpp index a282f0956..25acf57e1 100644 --- a/src/assistant/assistant/helpviewer_qwv.cpp +++ b/src/assistant/assistant/helpviewer_qwv.cpp @@ -89,6 +89,7 @@ HelpNetworkReply::HelpNetworkReply(const QNetworkRequest &request, { TRACE_OBJ setRequest(request); + setUrl(request.url()); setOpenMode(QIODevice::ReadOnly); setHeader(QNetworkRequest::ContentTypeHeader, mimeType); @@ -274,7 +275,7 @@ HelpViewer::HelpViewer(qreal zoom, QWidget *parent) connect(page(), SIGNAL(printRequested(QWebFrame*)), this, SIGNAL(printRequested())); setFont(viewerFont()); - setTextSizeMultiplier(zoom == 0.0 ? 1.0 : zoom); + setZoomFactor(zoom == 0.0 ? 1.0 : zoom); } QFont HelpViewer::viewerFont() const @@ -299,25 +300,25 @@ void HelpViewer::setViewerFont(const QFont &font) void HelpViewer::scaleUp() { TRACE_OBJ - setTextSizeMultiplier(textSizeMultiplier() + 0.1); + setZoomFactor(zoomFactor() + 0.1); } void HelpViewer::scaleDown() { TRACE_OBJ - setTextSizeMultiplier(qMax(0.0, textSizeMultiplier() - 0.1)); + setZoomFactor(qMax(0.0, zoomFactor() - 0.1)); } void HelpViewer::resetScale() { TRACE_OBJ - setTextSizeMultiplier(1.0); + setZoomFactor(1.0); } qreal HelpViewer::scale() const { TRACE_OBJ - return textSizeMultiplier(); + return zoomFactor(); } QString HelpViewer::title() const |