← Back to branch summary

~ubuntu-branches/ubuntu/raring/webkit-image/raring

« back to all changes in this revision

Viewing changes to webkit-image.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-05-01 22:43:08 UTC
  • mfrom: (2.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20110501224308-r0o1w948y8fytaus
Tags: 0.0.svn25399-2ubuntu1
* Merge from Debian unstable, remaining changes:
  - Change build-depends from libwebkit-dev to libwebkitgtk-dev as a
    part of webkit transition.

Show diffs side-by-side

added added

removed removed

Lines of Context:
webkit-image.cpp
151
151
  QObject::connect(page, SIGNAL(loadFinished(bool)), s, SLOT(loaded(bool)));
152
152
  QObject::connect(s, SIGNAL(finish(void)), &a, SLOT(quit()));
153
153
  /* set some useful defaults for a webpage */
154
 
  page->setViewportSize(QSize(1280,1024));
 
154
  // page->setViewportSize(QSize(1280,1024));
 
155
  // don't set size, or it breaks josm */
155
156
  page->mainFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
156
157
  page->mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
157
158
  page->mainFrame()->load (QUrl(url));