diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-24 04:22:15 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-24 04:22:15 (GMT) |
| commit | 435f6f842c116de641917d0b352f1c21cec666ee (patch) | |
| tree | d05c3c7a6e706be44b30e5983a9661aa065012bb /src/declarative/fx/qfxwebview.cpp | |
| parent | b8fba323c817a00df3c3639eb172104cf68d259d (diff) | |
| download | Qt-435f6f842c116de641917d0b352f1c21cec666ee.zip Qt-435f6f842c116de641917d0b352f1c21cec666ee.tar.gz Qt-435f6f842c116de641917d0b352f1c21cec666ee.tar.bz2 | |
Compile
Diffstat (limited to 'src/declarative/fx/qfxwebview.cpp')
| -rw-r--r-- | src/declarative/fx/qfxwebview.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp index f7979e5..ec7c548 100644 --- a/src/declarative/fx/qfxwebview.cpp +++ b/src/declarative/fx/qfxwebview.cpp @@ -461,7 +461,6 @@ void QFxWebView::paintPage(const QRect& r) update(); } -<<<<<<< HEAD:src/declarative/fx/qfxwebview.cpp /*! \qmlproperty int WebView::cacheSize @@ -507,13 +506,6 @@ void QFxWebView::setCacheSize(int pixels) } } d->max_imagecache_size = pixels; -======= -void QFxWebView::dump(int depth) -{ - QByteArray ba(depth * 4, ' '); - qWarning() << ba.constData() << "url:" << url(); - QFxPaintedItem::dump(depth); ->>>>>>> 124f5714e8e6ec1945d536e622b51304f2b32dd7:src/declarative/fx/qfxwebview.cpp } void QFxWebView::drawContents(QPainter *p, const QRect &r) |