diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-17 17:41:58 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-17 17:42:39 (GMT) |
| commit | 484a6043ef84df3d0d01a19247ea2c89eb8b309f (patch) | |
| tree | 43cbe0e0da00eff1f82a8ac5a641453cb730ce40 /demos/browser/browsermainwindow.h | |
| parent | 67b7d3ee2c30a710e765252a29ecb9a0ffd0a7a6 (diff) | |
| parent | a61adccf96a8ceefbf1150966adda3f6d226ec6d (diff) | |
| download | Qt-484a6043ef84df3d0d01a19247ea2c89eb8b309f.zip Qt-484a6043ef84df3d0d01a19247ea2c89eb8b309f.tar.gz Qt-484a6043ef84df3d0d01a19247ea2c89eb8b309f.tar.bz2 | |
Merge upstream/4.6 into oslo-staging-2
Diffstat (limited to 'demos/browser/browsermainwindow.h')
| -rw-r--r-- | demos/browser/browsermainwindow.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/demos/browser/browsermainwindow.h b/demos/browser/browsermainwindow.h index f5c14ea..f0f95b1 100644 --- a/demos/browser/browsermainwindow.h +++ b/demos/browser/browsermainwindow.h @@ -68,7 +68,6 @@ public: QSize sizeHint() const; public: - static QUrl guessUrlFromString(const QString &url); TabWidget *tabWidget() const; WebView *currentTab() const; QByteArray saveState(bool withTabs = true) const; |