diff options
| author | Ronan Collobert <ronan@collobert.com> | 2012-09-12 18:36:29 +0400 |
|---|---|---|
| committer | Ronan Collobert <ronan@collobert.com> | 2012-09-12 18:36:29 +0400 |
| commit | 7b6002cc48366feaf59c523b7b568fd52abfc53c (patch) | |
| tree | 5254f9df5b24010d6dad49cf310c7bf128bf8020 | |
| parent | 52e2475cd0328fe06af88d70f4abbbd954494991 (diff) | |
| parent | 2587e5e6acf712f6ffbe85e4b9a11ae321aa6e63 (diff) | |
Merge branch 'master' into noid
Conflicts:
extra/cuda/pkg/cutorch/TensorMath.lua
| -rw-r--r-- | packages/qtide/qluabrowser.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/packages/qtide/qluabrowser.cpp b/packages/qtide/qluabrowser.cpp index 19d1c96..f552662 100644 --- a/packages/qtide/qluabrowser.cpp +++ b/packages/qtide/qluabrowser.cpp @@ -932,21 +932,27 @@ QLuaBrowser::doReload() void QLuaBrowser::doZoomIn() { +#if HAVE_QTWEBKIT qreal z = d->w->zoomFactor() * 1.2; d->w->setZoomFactor(qMin(z, 4.0)); +#endif } void QLuaBrowser::doZoomOut() { +#if HAVE_QTWEBKIT qreal z = d->w->zoomFactor() / 1.2; d->w->setZoomFactor(qMax(z, 0.25)); +#endif } void QLuaBrowser::doZoomReset() { +#if HAVE_QTWEBKIT d->w->setZoomFactor(1.0); +#endif } |