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

Merge remote branch 'origin/2.1'

Browse Source 
Conflicts:
	share/qtcreator/templates/qmlapp/app.pro
	src/libs/utils/filesearch.cpp
This commit is contained in:
Oswald Buddenhagen
2010-10-18 20:59:12 +02:00
parent f3cb1f0bf3 9240ceaf35
commit dfee3388af
108 changed files with 1578 additions and 1006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/clonewizardpage.cpp
View File

@@ -62,7 +62,7 @@ bool CloneWizardPagePrivate::urlIsLocal(const QString &url)
{
if (url.startsWith(QLatin1String("file://"))
|| url.startsWith(QLatin1Char('/'))
|| url.at(0).isLetter() && url.at(1) == QChar(':') && url.at(2) == QChar('\\'))
|| (url.at(0).isLetter() && url.at(1) == QChar(':') && url.at(2) == QChar('\\')))
return true;
return false;
}

6
src/plugins/git/gitplugin.cpp
View File

@@ -402,7 +402,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
globalcontext, true, &GitClient::status);
createRepositoryAction(actionManager, gitContainer,
tr("Reset..."), QLatin1String("Git.UndoRepository"),
tr("Undo Uncommited Changes..."), QLatin1String("Git.UndoRepository"),
globalcontext, false, SLOT(undoRepositoryChanges()));
@@ -622,10 +622,10 @@ void GitPlugin::undoRepositoryChanges()
{
const VCSBase::VCSBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return)
const QString msg = tr("Revert all pending changes to the repository\n%1?").arg(QDir::toNativeSeparators(state.topLevel()));
const QString msg = tr("Undo all pending changes to the repository\n%1?").arg(QDir::toNativeSeparators(state.topLevel()));
const QMessageBox::StandardButton answer
= QMessageBox::question(m_core->mainWindow(),
tr("Revert"), msg,
tr("Undo Changes"), msg,
QMessageBox::Yes|QMessageBox::No,
QMessageBox::No);
if (answer == QMessageBox::No)

4
src/plugins/git/settingspage.ui
View File

@@ -131,14 +131,14 @@
<item row="5" column="0" colspan="2">
<widget class="QCheckBox" name="omitAnnotationDataCheckBox">
<property name="text">
<string>Omit date from annotation output</string>
<string>Omit date from blame output</string>
</property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<widget class="QCheckBox" name="spaceIgnorantBlameCheckBox">
<property name="text">
<string>Ignore whitespace changes in annotation and diff</string>
<string>Ignore whitespace changes in blame and diff</string>
</property>
</widget>
</item>