feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

general settings: compile fix msvc

Browse Source 
Change-Id: I377c269db97906796703df0881eb93d16ca95f5d
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-03-19 10:04:17 +01:00
committed by hjk
parent 76c4da3421
commit 4a075c3f0d
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/coreplugin/generalsettings.cpp
View File

@@ -220,19 +220,19 @@ void GeneralSettings::resetInterfaceColor()
m_page->colorButton->setColor(StyleHelper::DEFAULT_BASE_COLOR); m_page->colorButton->setColor(StyleHelper::DEFAULT_BASE_COLOR);
} }
#ifdef Q_OS_UNIX
void GeneralSettings::resetTerminal() void GeneralSettings::resetTerminal()
{ {
#if defined(Q_OS_UNIX)
m_page->terminalEdit->setText(ConsoleProcess::defaultTerminalEmulator() + QLatin1String(" -e")); m_page->terminalEdit->setText(ConsoleProcess::defaultTerminalEmulator() + QLatin1String(" -e"));
#endif
} }
#ifndef Q_OS_MAC
void GeneralSettings::resetFileBrowser() void GeneralSettings::resetFileBrowser()
{ {
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
m_page->externalFileBrowserEdit->setText(UnixUtils::defaultFileBrowser()); m_page->externalFileBrowserEdit->setText(UnixUtils::defaultFileBrowser());
#endif
} }
#endif
#endif
void GeneralSettings::variableHelpDialogCreator(const QString &helpText) 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() void GeneralSettings::showHelpForFileBrowser()
{ {
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
variableHelpDialogCreator(UnixUtils::fileBrowserHelpText()); variableHelpDialogCreator(UnixUtils::fileBrowserHelpText());
}
#endif #endif
}
void GeneralSettings::resetLanguage() void GeneralSettings::resetLanguage()
{ {

4
src/plugins/coreplugin/generalsettings.h
View File

@@ -67,13 +67,9 @@ public:
private slots: private slots:
void resetInterfaceColor(); void resetInterfaceColor();
void resetLanguage(); void resetLanguage();
#ifdef Q_OS_UNIX
# ifndef Q_OS_MAC
void showHelpForFileBrowser(); void showHelpForFileBrowser();
void resetFileBrowser(); void resetFileBrowser();
# endif
void resetTerminal(); void resetTerminal();
#endif
private: private:
void variableHelpDialogCreator(const QString &helpText); void variableHelpDialogCreator(const QString &helpText);