diff options
author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Tools/MiniBrowser/qt/BrowserView.cpp | |
parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Tools/MiniBrowser/qt/BrowserView.cpp')
-rw-r--r-- | Tools/MiniBrowser/qt/BrowserView.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Tools/MiniBrowser/qt/BrowserView.cpp b/Tools/MiniBrowser/qt/BrowserView.cpp index 6118f79..7d6426e 100644 --- a/Tools/MiniBrowser/qt/BrowserView.cpp +++ b/Tools/MiniBrowser/qt/BrowserView.cpp @@ -33,17 +33,14 @@ BrowserView::BrowserView(QGraphicsWKView::BackingStoreType backingStoreType, QWKContext* context, QWidget* parent) : QGraphicsView(parent) , m_item(0) - , m_context(context ? context : new QWKContext(this)) { - m_item = new QGraphicsWKView(m_context, backingStoreType, 0); + m_item = new QGraphicsWKView(context, backingStoreType, 0); setScene(new QGraphicsScene(this)); scene()->addItem(m_item); setFrameShape(QFrame::NoFrame); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - - connect(m_item, SIGNAL(titleChanged(QString)), this, SLOT(setWindowTitle(QString))); } void BrowserView::resizeEvent(QResizeEvent* event) |