diff --git a/CMakeLists.txt b/CMakeLists.txt index 102275750..7689401cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,8 +53,6 @@ endif() set (QT_MIN_VERSION "5.2.0") -find_package(kdeqt5staging REQUIRED NO_MODULE) - # Load CMake, Compiler and InstallDirs settings from KF5 and the following are already somewhat "done" tier1/tier2 libs from kdelibs: find_package(KF5 MODULE REQUIRED COMPONENTS CMake Compiler InstallDirs KIdleTime ItemModels KWidgetsAddons KWindowSystem KCodecs KArchive KCoreAddons Solid ThreadWeaver @@ -144,9 +142,7 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FR ################# setup the include directories ################# -include_directories( ${kdeqt5staging_INCLUDE_DIRS} - ${kdeqt5staging_INCLUDE_DIR} - ${KDE4_INCLUDES} +include_directories( ${KDE4_INCLUDES} ${KF5_INCLUDE_DIRS} # since e-c-m 0.0.7 ) diff --git a/src/plasma/CMakeLists.txt b/src/plasma/CMakeLists.txt index 1392309c4..128c17ea2 100644 --- a/src/plasma/CMakeLists.txt +++ b/src/plasma/CMakeLists.txt @@ -31,8 +31,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${KDE4_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}/KDE ${KDE4_INCLUDE_DIR}/kio - #FIXME: this will go into Qt upstream - ${CMAKE_INSTALL_PREFIX}/include/kdeqt5staging/ ) diff --git a/src/plasma/tests/kplugins/CMakeLists.txt b/src/plasma/tests/kplugins/CMakeLists.txt index 5c20c2785..5424b50f4 100644 --- a/src/plasma/tests/kplugins/CMakeLists.txt +++ b/src/plasma/tests/kplugins/CMakeLists.txt @@ -5,7 +5,7 @@ add_executable(plugintest plugintest.cpp ) -target_link_libraries(plugintest kdeqt5staging plasma ${KI18n_LIBRARIES} ${KService_LIBRARIES} ) +target_link_libraries(plugintest plasma ${KI18n_LIBRARIES} ${KService_LIBRARIES} ) message("INSTALL_TARGETS_DEFAULT_ARGS ${INSTALL_TARGETS_DEFAULT_ARGS}") diff --git a/src/plasmapkg/CMakeLists.txt b/src/plasmapkg/CMakeLists.txt index f1d01db51..af209a694 100644 --- a/src/plasmapkg/CMakeLists.txt +++ b/src/plasmapkg/CMakeLists.txt @@ -5,7 +5,7 @@ add_executable(plasmapkg plasmapkg.cpp ) -target_link_libraries(plasmapkg kdeqt5staging plasma ${KI18n_LIBRARIES} ${KService_LIBRARIES} KF5::KCoreAddons) +target_link_libraries(plasmapkg plasma ${KI18n_LIBRARIES} ${KService_LIBRARIES} KF5::KCoreAddons) message("INSTALL_TARGETS_DEFAULT_ARGS ${INSTALL_TARGETS_DEFAULT_ARGS}") diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt index 110f93bd6..4f310f04b 100644 --- a/src/shell/CMakeLists.txt +++ b/src/shell/CMakeLists.txt @@ -89,7 +89,6 @@ target_link_libraries(plasma-shell kdeclarative KF5::KI18n KF5::XmlGui - kdeqt5staging ) if(X11_FOUND)