diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-25 16:21:03 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-25 16:21:03 +0300 |
| commit | 0683ee31f0b08a7f75c89ee2e12399c404c29c60 (patch) | |
| tree | b717b79b67ae1ea01866799ac6d5cefd26927d58 /demos | |
| parent | 237c2afc0846224e00e5889c2c3ee8bde583689d (diff) | |
| parent | f2fa66d3dd722d88c651738bef7b1ccb3c91c156 (diff) | |
| download | qt4-tools-0683ee31f0b08a7f75c89ee2e12399c404c29c60.tar.gz | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/browser/browser.pro | 2 | ||||
| -rw-r--r-- | demos/browser/tabwidget.cpp | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/demos/browser/browser.pro b/demos/browser/browser.pro index afc25e3430..407030f24d 100644 --- a/demos/browser/browser.pro +++ b/demos/browser/browser.pro @@ -6,6 +6,8 @@ CONFIG += qt warn_on contains(QT_BUILD_PARTS, tools):!symbian:!embedded: CONFIG += uitools else: DEFINES += QT_NO_UITOOLS +release:DEFINES+=QT_NO_DEBUG_OUTPUT QT_NO_WARNING_OUTPUT + FORMS += \ addbookmarkdialog.ui \ bookmarks.ui \ diff --git a/demos/browser/tabwidget.cpp b/demos/browser/tabwidget.cpp index f2f1b329f9..8a7ae0b72c 100644 --- a/demos/browser/tabwidget.cpp +++ b/demos/browser/tabwidget.cpp @@ -560,10 +560,13 @@ void TabWidget::closeTab(int index) } hasFocus = tab->hasFocus(); - m_recentlyClosedTabsAction->setEnabled(true); - m_recentlyClosedTabs.prepend(tab->url()); - if (m_recentlyClosedTabs.size() >= TabWidget::m_recentlyClosedTabsSize) - m_recentlyClosedTabs.removeLast(); + QWebSettings *globalSettings = QWebSettings::globalSettings(); + if (!globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled)) { + m_recentlyClosedTabsAction->setEnabled(true); + m_recentlyClosedTabs.prepend(tab->url()); + if (m_recentlyClosedTabs.size() >= TabWidget::m_recentlyClosedTabsSize) + m_recentlyClosedTabs.removeLast(); + } } QWidget *lineEdit = m_lineEdits->widget(index); m_lineEdits->removeWidget(lineEdit); |