Merge branch 'master' into local-svn

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@979225 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 70 insertions, 14 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2ddf1117..92fd9d53 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,17 @@
+### ------- SETTING REKONQ FILES..
+
+if(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")
+
+SET( rekonq_NAM networkmanager.cpp )
+
+else(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")    
+
+SET( rekonq_NAM kaccessmanager.cpp )
+
+endif(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")
+
 SET( rekonq_SRCS
+    ${rekonq_NAM}
     autosaver.cpp 
     application.cpp 
     mainwindow.cpp 
@@ -12,7 +25,6 @@ SET( rekonq_SRCS
     historymenu.cpp
     bookmarks.cpp
     modelmenu.cpp 
-    networkaccessmanager.cpp
     urlbar.cpp
     findbar.cpp
     searchbar.cpp
@@ -28,6 +40,7 @@ SET( rekonq_SRCS
     cookieexceptiondialog.cpp
 )
 
+
 KDE4_ADD_UI_FILES( rekonq_SRCS
     cookies.ui
     cookiesexceptions.ui
@@ -43,26 +56,69 @@ KDE4_ADD_UI_FILES( rekonq_SRCS
 
 KDE4_ADD_KCFG_FILES( rekonq_SRCS rekonq.kcfgc )
 
-### ------------------------------------------
 
-ADD_DEFINITIONS( ${KDE4_DEFINITIONS} ${KDEWEBKIT_DEFINITIONS} )
+
+### ------------- INCLUDING DIRECTORIES...
+
+INCLUDE_DIRECTORIES (   ${CMAKE_CURRENT_SOURCE_DIR}
+                        ${CMAKE_CURRENT_BINARY_DIR}
+                        ${KDE4_INCLUDES}
+                        ${QT4_INCLUDES}
+                        ${KDEWEBKIT_INCLUDE_DIR}    
+)
+
+if(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")
+else(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")    
+
+    INCLUDE_DIRECTORIES( ${KDENETWORK_INCLUDE_DIR} )
+
+endif(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")
+
+
+
+### -------------- ADDING DEFINITIONS...
+
+ADD_DEFINITIONS (   ${KDE4_DEFINITIONS}
+                    ${KDEWEBKIT_DEFINITIONS}
+)
+
+if(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")
+else(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")    
+
+    ADD_DEFINITIONS ( ${KDENETWORK_DEFINITIONS} )
+
+endif(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")
+
+
+
+### --------------- ADDING EXECUTABLE...
 
 KDE4_ADD_EXECUTABLE( rekonq ${rekonq_SRCS} )
 
-TARGET_LINK_LIBRARIES( rekonq
-    ${QT_LIBRARIES} 
-    ${QT_QTNETWORK_LIBRARY}
-#     ${QT_QTWEBKIT_LIBRARY} 
-#     ${QT_QTUITOOLS_LIBRARY}
-	${KDE4_KUTILS_LIBS}
-	${KDE4_KDEUI_LIBS}
-    ${KDE4_KIO_LIBS}
-    ${KDEWEBKIT_LIBRARIES}
+
+
+### --------------- TARGETTING LINK LIBRARIES...
+
+TARGET_LINK_LIBRARIES ( rekonq
+                        ${QT_LIBRARIES} 
+                        ${QT_QTNETWORK_LIBRARY}
+                        ${KDE4_KUTILS_LIBS}
+                        ${KDE4_KDEUI_LIBS}
+                        ${KDE4_KIO_LIBS}
+                        ${KDEWEBKIT_LIBRARIES}
 )
 
-INSTALL( TARGETS rekonq ${INSTALL_TARGETS_DEFAULT_ARGS} )
+if(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")
+else(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")    
+
+    TARGET_LINK_LIBRARIES( ${KDENETWORK_LIBRARIES} )
 
-########### install files ###############
+endif(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")
 
+
+
+### ------------ INSTALL FILES...
+
+INSTALL( TARGETS rekonq ${INSTALL_TARGETS_DEFAULT_ARGS} )
 INSTALL( FILES rekonq.kcfg  DESTINATION  ${KCFG_INSTALL_DIR} )
 INSTALL( FILES rekonqui.rc  DESTINATION  ${DATA_INSTALL_DIR}/rekonq )