diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2009-09-18 19:28:32 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2009-09-18 19:28:32 +0200 |
commit | cb1bbf87674c292b9b2f9e445101e93147ca4943 (patch) | |
tree | a9a055b532be73193a7687613191e3ef2b7aa91a /src/CMakeLists.txt | |
parent | Open links in new tab located near currently active tab (diff) | |
parent | Really fixed 2 commits ago options.. :) (diff) | |
download | rekonq-cb1bbf87674c292b9b2f9e445101e93147ca4943.tar.xz |
Merge branch 'HomePageEmbedded2'
Seems fixed now. WE HAVE HOME PAGE!!
Conflicts:
src/mainview.cpp
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r-- | src/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f7d54c39..c443de2e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,6 +2,8 @@ SET( rekonq_SRCS homepage.cpp + previewimage.cpp + websnap.cpp networkaccessmanager.cpp autosaver.cpp application.cpp @@ -23,6 +25,7 @@ SET( rekonq_SRCS lineedit.cpp webpage.cpp sessionmanager.cpp + webpluginfactory.cpp ) @@ -30,6 +33,7 @@ KDE4_ADD_UI_FILES( rekonq_SRCS password.ui proxy.ui settings_general.ui + settings_newtabpage.ui settings_fonts.ui settings_proxy.ui settings_webkit.ui |