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

Fix build on windows

Browse Source 
Change-Id: Ifaa6468ca17cba1de808a9cbeba325925985ee10
Reviewed-on: http://codereview.qt-project.org/6077
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Tobias Hunger
2011-10-05 14:38:28 +00:00
parent 541e61612a
commit 41e01f1778
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/git/settingspage.cpp
View File

@@ -38,6 +38,7 @@
#include <vcsbase/vcsbaseconstants.h> #include <vcsbase/vcsbaseconstants.h>
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#include <QtCore/QDir>
#include <QtCore/QFileInfo> #include <QtCore/QFileInfo>
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QtCore/QTextStream> #include <QtCore/QTextStream>
@@ -58,7 +59,7 @@ SettingsPageWidget::SettingsPageWidget(QWidget *parent) :
= tr("Set the environment variable HOME to '%1'\n(%2).\n" = tr("Set the environment variable HOME to '%1'\n(%2).\n"
"This causes msysgit to look for the SSH-keys in that location\n" "This causes msysgit to look for the SSH-keys in that location\n"
"instead of its installation directory when run outside git bash."). "instead of its installation directory when run outside git bash.").
arg(GitClient::fakeWinHome(QProcessEnvironment::systemEnvironment()), arg(QDir::homePath(),
currentHome.isEmpty() ? tr("not currently set") : currentHome.isEmpty() ? tr("not currently set") :
tr("currently set to '%1'").arg(QString::fromLocal8Bit(currentHome))); tr("currently set to '%1'").arg(QString::fromLocal8Bit(currentHome)));
m_ui.winHomeCheckBox->setToolTip(toolTip); m_ui.winHomeCheckBox->setToolTip(toolTip);