removing last bits of Qt4 support

Signed-off-by: Denis Zalevskiy <denis.zalevskiy@jolla.com>

CMakeLists.txt

@@ -5,8 +5,6 @@ IF(NOT DEFINED VERSION)
   message(fatal_error "define VERSION")
 ENDIF(NOT DEFINED VERSION)
 
-option(ENABLE_QT4 "Build Qt4 version of libraries" OFF)
-
 option(ENABLE_MULTIARCH "enable support for multi-arch distros (lib64)" OFF)
 IF(ENABLE_MULTIARCH)
   IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
@@ -50,31 +48,6 @@ link_directories(
 add_custom_target(doc
   COMMAND doxygen ${CMAKE_CURRENT_SOURCE_DIR}/doc/Doxyfile)
 
-
-if(ENABLE_QT4)
-
-find_package(Qt4 4.7.0 REQUIRED)
-include(${QT_USE_FILE})
-add_definitions(-DQT_SHARED)
-
-include_directories(
-  ${QT_INCLUDE_DIR}
-)
-link_directories(
-  ${QT_LIBRARY_DIRS}
-)
-
-install(DIRECTORY include/statefs DESTINATION include/qt4)
-
-pkg_check_modules(CONTEXTSUBSCRIBER contextsubscriber-1.0 REQUIRED)
-pkg_check_modules(CONTEXTPROVIDER contextprovider-1.0 REQUIRED)
-include_directories(
-  ${CONTEXTSUBSCRIBER_INCLUDE_DIRS}
-  ${CONTEXTPROVIDER_INCLUDE_DIRS}
-)
-
-else(ENABLE_QT4)
-
 find_package(Qt5Core REQUIRED)
 
 include_directories(
@@ -89,12 +62,9 @@ install(DIRECTORY include/statefs DESTINATION include/qt5)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/contextsubscriber)
 install(FILES include/contextsubscriber/contextproperty.h DESTINATION include)
 
-endif(ENABLE_QT4)
-
 add_subdirectory(src/util)
 add_subdirectory(src/contextkit-subscriber)
 add_subdirectory(tests)
 add_subdirectory(tools/monitor)
 
-MESSAGE(STATUS "QT4=${ENABLE_QT4}")
 MESSAGE(STATUS "VERSION=${VERSION}")

include/statefs/qt/util.hpp

@@ -17,12 +17,7 @@
 
 namespace statefs { namespace qt {
 
-#if QT_VERSION < 0x050000
-typedef QFile FileErrorNs;
-#else
 typedef QFileDevice FileErrorNs;
-#endif
-
 class WriterImpl;
 
 /**

src/contextkit-subscriber/CMakeLists.txt

@@ -1,32 +1,5 @@
 set(CMAKE_AUTOMOC TRUE)
 
-if(ENABLE_QT4)
-
-configure_file(contextkit-statefs-qt4.pc.in contextkit-statefs-qt4.pc @ONLY)
-configure_file(contextsubscriber-1.0.pc.in contextsubscriber-1.0.pc @ONLY)
-
-# dirty hack: absolute path, moc is $$$
-qt4_wrap_cpp(LIB_MOC_SRC
-  /usr/include/contextsubscriber/contextproperty.h property.hpp actor.hpp
-)
-
-add_library(contextkit-statefs-qt4
-  SHARED property.cpp
-  ${LIB_MOC_SRC}
-)
-target_link_libraries(contextkit-statefs-qt4
-  ${QT_QTCORE_LIBRARY}
-  statefs-qt4
-  ${COR_LIBRARIES}
-  ${QTAROUND_LIBRARIES}
-)
-
-install(TARGETS contextkit-statefs-qt4 DESTINATION ${DST_LIB})
-install(FILES contextkit-statefs-qt4.pc DESTINATION ${DST_LIB}/pkgconfig)
-install(FILES contextsubscriber-1.0.pc DESTINATION ${DST_LIB}/pkgconfig)
-
-else(ENABLE_QT4)
-
 configure_file(contextkit-statefs.pc.in contextkit-statefs.pc @ONLY)
 configure_file(contextsubscriber-1.0.pc.in contextsubscriber-1.0.pc @ONLY)
 
@@ -48,5 +21,3 @@ target_link_libraries(contextkit-statefs-qt5
 install(TARGETS contextkit-statefs-qt5 DESTINATION ${DST_LIB})
 install(FILES contextkit-statefs.pc DESTINATION ${DST_LIB}/pkgconfig)
 install(FILES contextsubscriber-1.0.pc DESTINATION ${DST_LIB}/pkgconfig)
-
-endif(ENABLE_QT4)

src/contextkit-subscriber/property.cpp

@@ -671,7 +671,3 @@ void ContextProperty::ignoreCommander()
 void ContextProperty::setTypeCheck(bool typeCheck)
 {
 }
-
-#if QT_VERSION < 0x050000
-void ContextProperty::onValueChanged() { }
-#endif

src/util/CMakeLists.txt

@@ -1,32 +1,5 @@
 set(CMAKE_AUTOMOC TRUE)
 
-if(ENABLE_QT4)
-
-include_directories(
-  ${QT_QTCORE_INCLUDE_DIRS}
-)
-link_directories(
-  ${QT_QTCORE_LIBRARY_DIRS}
-)
-
-add_library(statefs-qt4
-  SHARED
-  util.cpp
-)
-target_link_libraries(statefs-qt4
-  ${QT_CORE_LIBRARIES}
-  ${COR_LIBRARIES}
-  ${QTAROUND_LIBRARIES}
-#  ${STATEFS_LIBRARIES}
-)
-
-configure_file(statefs-qt4.pc.in statefs-qt4.pc @ONLY)
-
-install(TARGETS statefs-qt4 DESTINATION ${DST_LIB})
-install(FILES statefs-qt4.pc DESTINATION ${DST_LIB}/pkgconfig)
-
-else(ENABLE_QT4)
-
 include_directories(
   ${Qt5Core_INCLUDE_DIRS}
 )
@@ -49,5 +22,3 @@ configure_file(statefs-qt5.pc.in statefs-qt5.pc @ONLY)
 
 install(TARGETS statefs-qt5 DESTINATION ${DST_LIB})
 install(FILES statefs-qt5.pc DESTINATION ${DST_LIB}/pkgconfig)
-
-endif(ENABLE_QT4)

tests/CMakeLists.txt

@@ -1,35 +1,14 @@
-if(ENABLE_QT4)
-
-include_directories(
-  ${QT_INCLUDE_DIR}
-  ${CONTEXTSUBSCRIBER_INCLUDE_DIRS}
-)
-set(SUBSCRIBER_LIB contextkit-statefs-qt4)
-
-else(ENABLE_QT4)
-
 set(SUBSCRIBER_LIB contextkit-statefs-qt5)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
 
 add_definitions(
   ${Qt5Core_DEFINITIONS}
 )
 
-endif(ENABLE_QT4)
-
-
 add_executable(atest-statefs_contextkit_subscriber_linking
   statefs_contextkit_subscriber_linking.cpp)
 
-
-if(ENABLE_QT4)
-target_link_libraries(atest-statefs_contextkit_subscriber_linking
-  ${QT_QTCORE_LIBRARY}
-  ${SUBSCRIBER_LIB}
-)
-else(ENABLE_QT4)
 target_link_libraries(atest-statefs_contextkit_subscriber_linking
   ${Qt5Core_LIBRARIES}
   ${SUBSCRIBER_LIB}
 )
-endif(ENABLE_QT4)

tools/monitor/CMakeLists.txt

@@ -1,12 +1,3 @@
-if(ENABLE_QT4)
-# target_link_libraries(contextkit-monitor
-#   ${QT_QTCORE_LIBRARY}
-# )
-
-MESSAGE(STATUS "Monitor tool is not built for Qt4")
-
-else(ENABLE_QT4)
-
 # fix for gcc 4.6 specific compiling/linking issues, no dwarf-4
 set(CMAKE_CXX_FLAGS
   "${CMAKE_CXX_FLAGS} -gdwarf-3"
@@ -30,5 +21,3 @@ add_executable(file-monitor filemon.cpp)
 target_link_libraries(file-monitor
   ${Qt5Core_LIBRARIES}
 )
-
-endif(ENABLE_QT4)