diff options
| author | adjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-05-06 23:02:43 +0000 |
|---|---|---|
| committer | adjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-05-06 23:02:43 +0000 |
| commit | 601ebdf6c4faea76016cf0d87d50abc260ca1569 (patch) | |
| tree | cf601630c933447f2a369f6245f9a04b9a46b08a /src/settings.cpp | |
| parent | Typographical and grammar corrections (diff) | |
| parent | EBN Krazy fixes. 1st round.. (diff) | |
| download | rekonq-601ebdf6c4faea76016cf0d87d50abc260ca1569.tar.xz | |
Fixing conflicts merging master
git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@964593 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/settings.cpp')
| -rw-r--r-- | src/settings.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/settings.cpp b/src/settings.cpp index 1e42413f..bf1f2e38 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -51,8 +51,7 @@ #include <KUrl> // Qt Includes -#include <QtGui> -#include <QtWebKit> +#include <QtGui/QWidget> class Private @@ -109,8 +108,10 @@ Private::Private(SettingsDialog *parent) pageItem->setIcon(webkitIcon); } + // ----------------------------------------------------------------------------------------------------- + SettingsDialog::SettingsDialog(QWidget *parent) : KConfigDialog(parent, "rekonfig", ReKonfig::self()) , d(new Private(this)) @@ -210,3 +211,4 @@ void SettingsDialog::setHomeToCurrentPage() d->generalUi.kcfg_homePage->setText(webView->url().prettyUrl()); } } + |