equal
deleted
inserted
replaced
47 vLayout->addItem(mWebView); |
47 vLayout->addItem(mWebView); |
48 vLayout->setContentsMargins(0,0,0,0); |
48 vLayout->setContentsMargins(0,0,0,0); |
49 setLayout(vLayout); |
49 setLayout(vLayout); |
50 } |
50 } |
51 |
51 |
52 void BrowserWrapper::setHtml(const QString& html, const QUrl& baseUrl) |
52 void BrowserWrapper::setHtml(const QString& html, const QUrl& url) |
53 { |
53 { |
54 mWebView->setHtml(html, baseUrl); |
54 mWebView->setHtml(html, url); |
55 |
55 |
56 if(!mHistory.count() || mHistory.top()!=baseUrl) |
56 if(!mHistory.count() || mHistory.top()!=url) |
57 { |
57 { |
58 mHistory.append(baseUrl); |
58 mHistory.append(url); |
59 } |
59 } |
60 } |
60 } |
61 |
61 |
62 void BrowserWrapper::clearHistory() |
62 void BrowserWrapper::clearHistory() |
63 { |
63 { |