Skip to content
Snippets Groups Projects
Commit 4a075c3f authored by hjk's avatar hjk Committed by hjk
Browse files

general settings: compile fix msvc


Change-Id: I377c269db97906796703df0881eb93d16ca95f5d
Reviewed-by: default avatarEike Ziller <eike.ziller@nokia.com>
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 76c4da34
No related branches found
No related tags found
No related merge requests found
......@@ -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()
{
......
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment