From 87e8d0ba5f80f53a62a3951537b60a24e72e8460 Mon Sep 17 00:00:00 2001 From: Elvis Angelaccio Date: Sun, 21 Jan 2018 12:18:21 +0100 Subject: Build TerminalPanel also on Windows Summary: terminalpanel.cpp *should* compile on Windows, so there is no reason to remove it from the build and use tons of #ifdefs in dolphinmainwindow. We still keep the terminal panel disabled on Windows (i.e. the two remaining #ifndef Q_OS_WIN in dolphinmainwindow), because it is probably not functional. But at least we won't break the Windows CI every time someone touches the terminal panel code (see e.g. 2e942237c9). Test Plan: Builds on Linux, someone on Windows should test this patch if possible. Reviewers: #dolphin, #craft Differential Revision: https://phabricator.kde.org/D10006 --- src/CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9a8302ff1..89180b780 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -224,6 +224,7 @@ set(dolphinstatic_SRCS panels/folders/foldersitemlistwidget.cpp panels/folders/treeviewcontextmenu.cpp panels/folders/folderspanel.cpp + panels/terminal/terminalpanel.cpp search/dolphinfacetswidget.cpp search/dolphinsearchbox.cpp settings/general/behaviorsettingspage.cpp @@ -266,10 +267,6 @@ kconfig_add_kcfg_files(dolphinstatic_SRCS GENERATE_MOC settings/dolphin_versioncontrolsettings.kcfgc ) -if(NOT WIN32) - set(dolphinstatic_SRCS ${dolphinstatic_SRCS} panels/terminal/terminalpanel.cpp) -endif() - qt5_add_resources(dolphinstatic_SRCS dolphin.qrc) add_library(dolphinstatic STATIC ${dolphinstatic_SRCS}) -- cgit v1.3.1