diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-11-28 18:49:35 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-11-28 18:49:35 +0100 |
| commit | e7faff501cefd8fb773bf0616f7d43bd5cdf9f0a (patch) | |
| tree | 9d03b385b1eca31487d5df6c0460e335bca6e663 /src/CMakeLists.txt | |
| parent | removed current bugged adblock implementation. (diff) | |
| parent | clicktoflash : more cleanup (diff) | |
| download | rekonq-e7faff501cefd8fb773bf0616f7d43bd5cdf9f0a.tar.xz | |
Merge commit 'refs/merge-requests/2237' of git://gitorious.org/rekonq/mainline into FLASH
Conflicts:
src/CMakeLists.txt
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8faa93b1..1f9127f4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -18,24 +18,25 @@ SET( rekonq_KDEINIT_SRCS webpluginfactory.cpp websnap.cpp webview.cpp -#---------------------------------------- + clicktoflash.cpp + #---------------------------------------- history/autosaver.cpp history/historymanager.cpp history/historymodels.cpp history/historypanel.cpp history/sidepanel.cpp -#---------------------------------------- + #---------------------------------------- rekonqpage/newtabpage.cpp -#---------------------------------------- + #---------------------------------------- settings/settingsdialog.cpp -#---------------------------------------- + #---------------------------------------- bookmarks/bookmarksmanager.cpp bookmarks/bookmarkspanel.cpp bookmarks/bookmarkstreemodel.cpp bookmarks/bookmarksproxy.cpp -#---------------------------------------- + #---------------------------------------- adblock/adblockmanager.cpp -#---------------------------------------- + #---------------------------------------- urlbar/urlbar.cpp urlbar/lineedit.cpp ) |