┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorElvis Angelaccio <[email protected]>2017-10-14 12:36:26 +0200
committerElvis Angelaccio <[email protected]>2017-10-14 12:36:26 +0200
commit7787f080678ffd428b269acd8db370a8c0026b37 (patch)
tree0249d910e28f0f9b3b1b2b9c69dd1bfca096c2bb /src
parentbd47eb2e6d80315115bb3f58987162fcb4911b10 (diff)
Fix build on Windows
TerminalPanel is not available on Windows, so commit bd47eb2e6d broke the MSVC build on the CI.
Diffstat (limited to 'src')
-rw-r--r--src/dolphinmainwindow.cpp4
-rw-r--r--src/dolphinmainwindow.h4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index cd232577d..07e80d586 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -100,7 +100,9 @@ DolphinMainWindow::DolphinMainWindow() :
m_controlButton(0),
m_updateToolBarTimer(0),
m_lastHandleUrlStatJob(0),
+#ifndef Q_OS_WIN
m_terminalPanel(0),
+#endif
m_placesPanel(0),
m_tearDownFromPlacesRequested(false)
{
@@ -1002,6 +1004,7 @@ void DolphinMainWindow::setUrlAsCaption(const QUrl& url)
setWindowTitle(schemePrefix + fileName);
}
+#ifndef Q_OS_WIN
void DolphinMainWindow::slotStorageTearDownFromPlacesRequested(const QString& mountPath)
{
if (m_terminalPanel->currentWorkingDirectory().startsWith(mountPath)) {
@@ -1020,6 +1023,7 @@ void DolphinMainWindow::slotStorageTearDownExternallyRequested(const QString& mo
m_terminalPanel->goHome();
}
}
+#endif
void DolphinMainWindow::setupActions()
{
diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 634c2a9e7..c05fc34ad 100644
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -47,7 +47,9 @@ class KNewFileMenu;
class QToolButton;
class QIcon;
class PlacesPanel;
+#ifndef Q_OS_WIN
class TerminalPanel;
+#endif
/**
* @short Main window for Dolphin.
@@ -516,7 +518,9 @@ private:
KIO::Job* m_lastHandleUrlStatJob;
+#ifndef Q_OS_WIN
TerminalPanel* m_terminalPanel;
+#endif
PlacesPanel* m_placesPanel;
bool m_tearDownFromPlacesRequested;
};