diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-08-20 19:30:26 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-08-20 19:30:26 +0200 |
| commit | aa05bd3973a2f39f50c14314840f0fe078f16444 (patch) | |
| tree | dd21ae094321ca9f0b803379ad7e93a6b065ec10 /src/CMakeLists.txt | |
| parent | bk toolbar by default for the next rekonq. (diff) | |
| parent | Change from QByteArray to QString in the right way (diff) | |
| download | rekonq-aa05bd3973a2f39f50c14314840f0fe078f16444.tar.xz | |
Merge branch 'opensearch'
Conflicts:
src/CMakeLists.txt
src/urlbar/urlresolver.cpp
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 151906b9..cc381c94 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -29,7 +29,6 @@ SET( rekonq_KDEINIT_SRCS websnap.cpp webview.cpp webtab.cpp - searchengine.cpp #---------------------------------------- history/autosaver.cpp history/historymanager.cpp @@ -69,6 +68,12 @@ SET( rekonq_KDEINIT_SRCS #---------------------------------------- analyzer/analyzerpanel.cpp analyzer/networkanalyzer.cpp + #---------------------------------------- + search/searchengine.cpp + search/opensearchwriter.cpp + search/opensearchreader.cpp + search/opensearchmanager.cpp + search/opensearchengine.cpp ) @@ -94,6 +99,7 @@ INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/rekonqpage ${CMAKE_CURRENT_SOURCE_DIR}/settings ${CMAKE_CURRENT_SOURCE_DIR}/analyzer + ${CMAKE_CURRENT_SOURCE_DIR}/search ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} ${QT4_INCLUDES} @@ -112,8 +118,9 @@ KDE4_ADD_KDEINIT_EXECUTABLE( rekonq ${rekonq_KDEINIT_SRCS} main.cpp ) ### --------------- TARGETTING LINK LIBRARIES... TARGET_LINK_LIBRARIES ( kdeinit_rekonq - ${QT_LIBRARIES} - ${QT_QTWEBKIT_LIBRARY} + ${QT_LIBRARIES} + ${QT_QTSCRIPT_LIBRARY} + ${QT_QTWEBKIT_LIBRARY} ${KDE4_KDEWEBKIT_LIBS} ${KDE4_KUTILS_LIBS} ${KDE4_KDEUI_LIBS} |