diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-17 14:27:48 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-17 14:27:48 (GMT) |
| commit | 62e641691b9a3eadc8b9fb2e31150cdf5b66115d (patch) | |
| tree | 9033ae42f5b599e564421db69737ca0c70a85f53 /demos/browser/browsermainwindow.h | |
| parent | e76c4c03c98091ee3e509a0f9b64daba472567ff (diff) | |
| parent | e02859c3c7910ab3de0ec594fd493df946a5102d (diff) | |
| download | Qt-62e641691b9a3eadc8b9fb2e31150cdf5b66115d.zip Qt-62e641691b9a3eadc8b9fb2e31150cdf5b66115d.tar.gz Qt-62e641691b9a3eadc8b9fb2e31150cdf5b66115d.tar.bz2 | |
Merge remote branch 'mainline/4.6' into 4.6
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; |