mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-12 12:54:29 +00:00
Fix build on Windows
TerminalPanel is not available on Windows, so commit bd47eb2e6d
broke
the MSVC build on the CI.
This commit is contained in:
parent
bd47eb2e6d
commit
7787f08067
|
@ -100,7 +100,9 @@ DolphinMainWindow::DolphinMainWindow() :
|
||||||
m_controlButton(0),
|
m_controlButton(0),
|
||||||
m_updateToolBarTimer(0),
|
m_updateToolBarTimer(0),
|
||||||
m_lastHandleUrlStatJob(0),
|
m_lastHandleUrlStatJob(0),
|
||||||
|
#ifndef Q_OS_WIN
|
||||||
m_terminalPanel(0),
|
m_terminalPanel(0),
|
||||||
|
#endif
|
||||||
m_placesPanel(0),
|
m_placesPanel(0),
|
||||||
m_tearDownFromPlacesRequested(false)
|
m_tearDownFromPlacesRequested(false)
|
||||||
{
|
{
|
||||||
|
@ -1002,6 +1004,7 @@ void DolphinMainWindow::setUrlAsCaption(const QUrl& url)
|
||||||
setWindowTitle(schemePrefix + fileName);
|
setWindowTitle(schemePrefix + fileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef Q_OS_WIN
|
||||||
void DolphinMainWindow::slotStorageTearDownFromPlacesRequested(const QString& mountPath)
|
void DolphinMainWindow::slotStorageTearDownFromPlacesRequested(const QString& mountPath)
|
||||||
{
|
{
|
||||||
if (m_terminalPanel->currentWorkingDirectory().startsWith(mountPath)) {
|
if (m_terminalPanel->currentWorkingDirectory().startsWith(mountPath)) {
|
||||||
|
@ -1020,6 +1023,7 @@ void DolphinMainWindow::slotStorageTearDownExternallyRequested(const QString& mo
|
||||||
m_terminalPanel->goHome();
|
m_terminalPanel->goHome();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
void DolphinMainWindow::setupActions()
|
void DolphinMainWindow::setupActions()
|
||||||
{
|
{
|
||||||
|
|
|
@ -47,7 +47,9 @@ class KNewFileMenu;
|
||||||
class QToolButton;
|
class QToolButton;
|
||||||
class QIcon;
|
class QIcon;
|
||||||
class PlacesPanel;
|
class PlacesPanel;
|
||||||
|
#ifndef Q_OS_WIN
|
||||||
class TerminalPanel;
|
class TerminalPanel;
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @short Main window for Dolphin.
|
* @short Main window for Dolphin.
|
||||||
|
@ -516,7 +518,9 @@ private:
|
||||||
|
|
||||||
KIO::Job* m_lastHandleUrlStatJob;
|
KIO::Job* m_lastHandleUrlStatJob;
|
||||||
|
|
||||||
|
#ifndef Q_OS_WIN
|
||||||
TerminalPanel* m_terminalPanel;
|
TerminalPanel* m_terminalPanel;
|
||||||
|
#endif
|
||||||
PlacesPanel* m_placesPanel;
|
PlacesPanel* m_placesPanel;
|
||||||
bool m_tearDownFromPlacesRequested;
|
bool m_tearDownFromPlacesRequested;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue