From f0fd61b5e50c3495acd977d594c5507ffdd5fbd9 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 22 May 2009 15:14:03 +0200 Subject: CMakeLists.. --- src/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a64cc747..dd7414a5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -41,18 +41,19 @@ KDE4_ADD_KCFG_FILES( rekonq_SRCS rekonq.kcfgc ) ### ------------------------------------------ -ADD_DEFINITIONS( ${KDE4_DEFINITIONS} ) +ADD_DEFINITIONS( ${KDE4_DEFINITIONS} ${KDEWEBKIT_DEFINITIONS} ) KDE4_ADD_EXECUTABLE( rekonq ${rekonq_SRCS} ) TARGET_LINK_LIBRARIES( rekonq ${QT_LIBRARIES} ${QT_QTNETWORK_LIBRARY} - ${QT_QTWEBKIT_LIBRARY} +# ${QT_QTWEBKIT_LIBRARY} ${QT_QTUITOOLS_LIBRARY} ${KDE4_KUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} + ${KDEWEBKIT_LIBRARIES} ) INSTALL( TARGETS rekonq ${INSTALL_TARGETS_DEFAULT_ARGS} ) -- cgit v1.2.1 From d361249be9ec31d575713739f032394383052705 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 22 May 2009 15:42:00 +0200 Subject: Compiles && link with webkitKDE modulo the load method --- src/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dd7414a5..7fba4466 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -41,6 +41,11 @@ KDE4_ADD_KCFG_FILES( rekonq_SRCS rekonq.kcfgc ) ### ------------------------------------------ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${KDEWEBKIT_INCLUDE_DIR} + ) + ADD_DEFINITIONS( ${KDE4_DEFINITIONS} ${KDEWEBKIT_DEFINITIONS} ) KDE4_ADD_EXECUTABLE( rekonq ${rekonq_SRCS} ) -- cgit v1.2.1 From 2e66b40db71b99220754c126a8e4e3606c3505f2 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sat, 23 May 2009 01:22:31 +0200 Subject: Fixing new AccessManager. Removed webpage createPlugin slot --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7fba4466..615a68e5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -54,7 +54,7 @@ TARGET_LINK_LIBRARIES( rekonq ${QT_LIBRARIES} ${QT_QTNETWORK_LIBRARY} # ${QT_QTWEBKIT_LIBRARY} - ${QT_QTUITOOLS_LIBRARY} +# ${QT_QTUITOOLS_LIBRARY} ${KDE4_KUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} -- cgit v1.2.1 From e6752ba908497ae0c3756315b75509efb2fdbf26 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sat, 23 May 2009 01:28:39 +0200 Subject: splitted web classes --- src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 615a68e5..cbb1421d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -22,6 +22,7 @@ SET( rekonq_SRCS panelhistory.cpp lineedit.cpp stackedurlbar.cpp + webpage.cpp ) KDE4_ADD_UI_FILES( rekonq_SRCS -- cgit v1.2.1 From 7aad2cdabf718b113284d5835a821c059dff5f72 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Mon, 25 May 2009 12:27:17 +0200 Subject: Fixing CMakelists.txt's --- src/CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cbb1421d..064fc0e6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -42,11 +42,6 @@ KDE4_ADD_KCFG_FILES( rekonq_SRCS rekonq.kcfgc ) ### ------------------------------------------ -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/.. - ${KDEWEBKIT_INCLUDE_DIR} - ) - ADD_DEFINITIONS( ${KDE4_DEFINITIONS} ${KDEWEBKIT_DEFINITIONS} ) KDE4_ADD_EXECUTABLE( rekonq ${rekonq_SRCS} ) -- cgit v1.2.1