diff --git a/settings/konqhtml/CMakeLists.txt b/settings/konqhtml/CMakeLists.txt --- a/settings/konqhtml/CMakeLists.txt +++ b/settings/konqhtml/CMakeLists.txt @@ -32,10 +32,6 @@ add_library(kcm_konqhtml MODULE ${kcm_konqhtml_PART_SRCS}) -# For khtmldefaults.h. We don't need to link to khtml, just to include that header... -get_target_property(khtml_include_dir KF5::KHtml INTERFACE_INCLUDE_DIRECTORIES) -target_include_directories(kcm_konqhtml PRIVATE "${khtml_include_dir}") - target_link_libraries(kcm_konqhtml KF5::Parts KF5::KDELibs4Support diff --git a/settings/konqhtml/appearance.cpp b/settings/konqhtml/appearance.cpp --- a/settings/konqhtml/appearance.cpp +++ b/settings/konqhtml/appearance.cpp @@ -1,4 +1,5 @@ #include "appearance.h" +#include "../../src/htmldefaults.h" #include "kcmcss.h" @@ -12,7 +13,6 @@ #include #include #include -#include #include #include #include diff --git a/src/htmldefaults.h b/src/htmldefaults.h new file mode 100644 --- /dev/null +++ b/src/htmldefaults.h @@ -0,0 +1,33 @@ +/* This file is part of the KDE project + Copyright (C) 1998, 1999 Torben Weis + Copyright (C) 1999 David Faure + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +// browser window color defaults -- Bernd +#define HTML_DEFAULT_LNK_COLOR Qt::blue +#define HTML_DEFAULT_TXT_COLOR Qt::black +#define HTML_DEFAULT_VLNK_COLOR Qt::magenta +#define HTML_DEFAULT_BASE_COLOR Qt::white + +#define HTML_DEFAULT_VIEW_FONT "Sans Serif" +#define HTML_DEFAULT_VIEW_FIXED_FONT "Monospace" +#define HTML_DEFAULT_VIEW_SERIF_FONT "Serif" +#define HTML_DEFAULT_VIEW_SANSSERIF_FONT "Sans Serif" +#define HTML_DEFAULT_VIEW_CURSIVE_FONT "Cursive" +#define HTML_DEFAULT_VIEW_FANTASY_FONT "Fantasy" +#define HTML_DEFAULT_MIN_FONT_SIZE 7 // everything smaller is usually unreadable. diff --git a/webenginepart/src/settings/webenginesettings.cpp b/webenginepart/src/settings/webenginesettings.cpp --- a/webenginepart/src/settings/webenginesettings.cpp +++ b/webenginepart/src/settings/webenginesettings.cpp @@ -21,6 +21,7 @@ #include "webengine_filter.h" #include +#include "../../src/htmldefaults.h" #include #include @@ -34,20 +35,6 @@ #include #include -// browser window color defaults -- Bernd -#define HTML_DEFAULT_LNK_COLOR Qt::blue -#define HTML_DEFAULT_TXT_COLOR Qt::black -#define HTML_DEFAULT_VLNK_COLOR Qt::magenta -#define HTML_DEFAULT_BASE_COLOR Qt::white - -#define HTML_DEFAULT_VIEW_FONT "Sans Serif" -#define HTML_DEFAULT_VIEW_FIXED_FONT "Monospace" -#define HTML_DEFAULT_VIEW_SERIF_FONT "Serif" -#define HTML_DEFAULT_VIEW_SANSSERIF_FONT "Sans Serif" -#define HTML_DEFAULT_VIEW_CURSIVE_FONT "Sans Serif" -#define HTML_DEFAULT_VIEW_FANTASY_FONT "Sans Serif" -#define HTML_DEFAULT_MIN_FONT_SIZE 7 // everything smaller is usually unreadable. - /** * @internal * Contains all settings which are both available globally and per-domain