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/dolphinmainwindow.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/dolphinmainwindow.h') diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index e81793b0f..5e900e930 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -47,9 +47,7 @@ class KNewFileMenu; class QToolButton; class QIcon; class PlacesPanel; -#ifndef Q_OS_WIN class TerminalPanel; -#endif /** * @short Main window for Dolphin. @@ -517,9 +515,7 @@ private: KIO::Job* m_lastHandleUrlStatJob; -#ifndef Q_OS_WIN TerminalPanel* m_terminalPanel; -#endif PlacesPanel* m_placesPanel; bool m_tearDownFromPlacesRequested; }; -- cgit v1.3