diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp index 87d2db42cfa2858d4e9ee693944b1b06fd25b619..c75caa48e91c2291ace5a2362488837e3673763a 100644 --- a/src/plugins/coreplugin/generalsettings.cpp +++ b/src/plugins/coreplugin/generalsettings.cpp @@ -220,19 +220,19 @@ void GeneralSettings::resetInterfaceColor() m_page->colorButton->setColor(StyleHelper::DEFAULT_BASE_COLOR); } -#ifdef Q_OS_UNIX void GeneralSettings::resetTerminal() { +#if defined(Q_OS_UNIX) m_page->terminalEdit->setText(ConsoleProcess::defaultTerminalEmulator() + QLatin1String(" -e")); +#endif } -#ifndef Q_OS_MAC void GeneralSettings::resetFileBrowser() { +#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) m_page->externalFileBrowserEdit->setText(UnixUtils::defaultFileBrowser()); -} -#endif #endif +} void GeneralSettings::variableHelpDialogCreator(const QString &helpText) @@ -257,12 +257,12 @@ void GeneralSettings::variableHelpDialogCreator(const QString &helpText) } -#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) void GeneralSettings::showHelpForFileBrowser() { +#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) variableHelpDialogCreator(UnixUtils::fileBrowserHelpText()); -} #endif +} void GeneralSettings::resetLanguage() { diff --git a/src/plugins/coreplugin/generalsettings.h b/src/plugins/coreplugin/generalsettings.h index 66ccbeb814912bda8de2245c56eba910946b1dad..e5b5220d74a0ac27cccde2a3a0c8dc65ca453690 100644 --- a/src/plugins/coreplugin/generalsettings.h +++ b/src/plugins/coreplugin/generalsettings.h @@ -67,13 +67,9 @@ public: private slots: void resetInterfaceColor(); void resetLanguage(); -#ifdef Q_OS_UNIX -# ifndef Q_OS_MAC void showHelpForFileBrowser(); void resetFileBrowser(); -# endif void resetTerminal(); -#endif private: void variableHelpDialogCreator(const QString &helpText);