Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
SDK
KDiff3
Commits
a8835f7f
Commit
a8835f7f
authored
Sep 05, 2016
by
Michael Reeves
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
*fix remaining build issues KDE4Support no longer needed.
parent
eafab138
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
CMakeLists.txt
CMakeLists.txt
+1
-1
src/optiondialog.cpp
src/optiondialog.cpp
+9
-9
No files found.
CMakeLists.txt
View file @
a8835f7f
...
...
@@ -23,7 +23,7 @@ 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::IconThemes
)
SET
(
KDiff3_LIBRARIES
${
Qt5PrintSupport_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
}
"
)
...
...
src/optiondialog.cpp
View file @
a8835f7f
...
...
@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#include <QApplication>
#include <QCheckBox>
#include <QComboBox>
#include <QLabel>
...
...
@@ -36,15 +36,15 @@
#include <QVBoxLayout>
#include <QFontDatabase>
#include <kapplication.h>
#include <kcolorbutton.h>
#include <kfontdialog.h> // For KFontChooser
#include <kiconloader.h>
#include <kconfig.h>
#include <kmessagebox.h>
#include <kmainwindow.h> //For ktoolbar.h
#include <ktoolbar.h>
#include <KColorButton>
#include <KFontChooser>
#include <KIconLoader>
#include <KSharedConfig>
#include <KMessageBox>
#include <KMainWindow> //For ktoolbar.h
#include <KToolBar>
#include <KHelpClient>
#include <KLocalizedString>
#include <map>
#include "optiondialog.h"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment