[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/libs/webkitkde
From:       Urs Wolfer <uwolfer () kde ! org>
Date:       2009-08-06 18:48:49
Message-ID: 1249584529.969194.18228.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1008044 by uwolfer:

Remove KDE 4.2 compatibility code. The QNetworkAccessManager code is in KIO since KDE \
4.3.

 M  +0 -6      CMakeLists.txt  
 M  +0 -13     kdelauncher/CMakeLists.txt  
 D             kdenetwork (directory)  
 M  +0 -13     kdewebkit/CMakeLists.txt  
 M  +0 -6      kdewebkit/kwebpage.cpp  


--- trunk/playground/libs/webkitkde/CMakeLists.txt #1008043:1008044
@@ -9,12 +9,6 @@
     ${CMAKE_SOURCE_DIR}/kdewebkit/cmake/modules
     ${CMAKE_SOURCE_DIR}/part/cmake/modules)
 
-if(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")
-else(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")	
-    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} \
                ${CMAKE_SOURCE_DIR}/kdenetwork/cmake/modules)
-    add_subdirectory(kdenetwork)
-endif(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")
-
 add_subdirectory(icons)
 add_subdirectory(kdewebkit)
 add_subdirectory(part)
--- trunk/playground/libs/webkitkde/kdelauncher/CMakeLists.txt #1008043:1008044
@@ -7,20 +7,7 @@
 link_directories(${KDE4_LIB_DIR} ${CMAKE_SOURCE_DIR}/kdenetwork \
${CMAKE_CURRENT_SOURCE_DIR}/../kdewebkit)  add_definitions(${QT_DEFINITIONS} \
${KDE4_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")
-    # QtWebKit uses QtNetwork, to KdeWebKit uses....
-    # Starting from kdelibs 4.2.70, KIO does contain the network part.
-    find_package(KdeNetwork REQUIRED)
-    include_directories(${KDENETWORK_INCLUDE_DIR})
-endif(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")
-
 #qt4_add_resources( kdelauncher_SRCS kdelauncher.qrc )
 
 kde4_add_executable(kdelauncher main.cpp )
 target_link_libraries( kdelauncher ${KDE4_KDEUI_LIBS} kdewebkit )
-
-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(kdelauncher ${KDENETWORK_LIBRARIES})
-endif(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")
--- trunk/playground/libs/webkitkde/kdewebkit/CMakeLists.txt #1008043:1008044
@@ -5,14 +5,6 @@
 include(KDE4Defaults)
 include(MacroLibrary)
 
-if(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")
-else(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")
-    # QtWebKit uses QtNetwork, to KdeWebKit uses....
-    # Starting from kdelibs 4.2.70, KIO does contain the network part.
-    find_package(KdeNetwork REQUIRED)
-    include_directories(${KDENETWORK_INCLUDE_DIR})
-endif(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")
-
 include_directories(${KDE4_INCLUDES} ${CMAKE_SOURCE_DIR})
 add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 
@@ -41,11 +33,6 @@
     ${QT_QTXML_LIBRARY}
 )
 
-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(kdewebkit ${KDENETWORK_LIBRARIES})
-endif(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")
-
 #set_target_properties(kdewebkit PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION \
${GENERIC_LIB_SOVERSION})  set_target_properties(kdewebkit PROPERTIES VERSION 1.0.0 \
SOVERSION 1) # for the moment keep something low...  
--- trunk/playground/libs/webkitkde/kdewebkit/kwebpage.cpp #1008043:1008044
@@ -43,14 +43,8 @@
 #include <KIO/Job>
 #include <KDE/KUrl>
 
-#if KDE_IS_VERSION(4, 2, 70)
 #include <KIO/AccessManager>
 typedef KIO::AccessManager BaseAccessManager;
-#else
-#include <kdenetwork/knetworkaccessmanager.h>
-#include <kdenetwork/knetworkreply.h>
-typedef KNetworkAccessManager BaseAccessManager;
-#endif
 
 #include <QWebFrame>
 #include <QUiLoader>


[prev in list] [next in list] [prev in thread] [next in thread]