Commit eafab138 authored by Michael Reeves's avatar Michael Reeves

*disambiguate some headers so KF5 version is chosen

--Uncovered one missing module.
*scrat deprecated headers no longer needed
parent 0bd67f9a
......@@ -16,14 +16,14 @@ include(FeatureSummary)
include(ECMInstallIcons)
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Widgets)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n CoreAddons KDELibs4Support)
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Widgets PrintSupport)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n CoreAddons IconThemes)
find_package(KF5DocTools ${KF5_MIN_VERSION} REQUIRED )
# I don't need warnings about wired things in comments.
SET(CLANG_WARNING_FLAGS -Wno-comment)
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
SET(KDiff3_LIBRARIES KF5::I18n KF5::CoreAddons KF5::KDELibs4Support)
SET(KDiff3_LIBRARIES KF5::I18n KF5::CoreAddons KF5::IconThemes)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CLANG_WARNING_FLAGS}")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CLANG_WARNING_FLAGS}")
......@@ -33,6 +33,7 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_KEYWORD
include_directories(
${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS}
${Qt5PrintSupport_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
)
......
......@@ -36,7 +36,6 @@
#include <QMimeData>
#include <klocalizedstring.h>
#include <kfiledialog.h>
#include <cmath>
#include <cstdlib>
......
......@@ -42,16 +42,15 @@
#include <QStatusBar>
#include <QCommandLineParser>
// include files for KDE
#include <kiconloader.h>
#include <kmessagebox.h>
#include <klocalizedstring.h>
#include <KMessageBox>
#include <KLocalizedString>
#include <kconfig.h>
#include <kstandardaction.h>
#include <KStandardAction>
//#include <kkeydialog.h>
#include <ktoggleaction.h>
#include <ktoolbar.h>
#include <kiconloader.h>
#include <kactioncollection.h>
#include <KToggleAction>
#include <KToolBar>
#include <KIconLoader>
#include <KActionCollection>
// application specific includes
#include "kdiff3_shell.h"
......
......@@ -28,11 +28,11 @@
// include files for KDE
#include <QApplication>
#include <kmainwindow.h>
#include <KMainWindow>
#include <QAction>
#include <QUrl>
#include <kparts/mainwindow.h>
#include <ktoggleaction.h>
#include <KParts/MainWindow>
#include <KToggleAction>
#include <KAboutData>
#include <KSharedConfig>
#include <KConfigGroup>
......
......@@ -21,7 +21,7 @@
#define _KDIFF3PART_H_
#include <kparts/part.h>
#include <kparts/factory.h>
#include <KPluginFactory>
#include <kparts/readwritepart.h>
class QWidget;
......
......@@ -25,7 +25,6 @@
#include <kpagedialog.h>
#include <QStringList>
#include <list>
#include <kcmdlineargs.h>
#include "options.h"
......
......@@ -40,7 +40,6 @@
#include <klocalizedstring.h>
#include <kmessagebox.h>
#include <kfontdialog.h>
#include <qstatusbar.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment