forked from qt-creator/qt-creator
Git: Support encoding convert of commit messages
We need read i18n.commitEncoding value, to write correct encoding of the commit file. In Windows OS, the default encoding is GBK, So we need convert to correct encoding of the commit messages. Change-Id: Id5f35745dba15da2c9ceb1266e0ea537cba7da73 Merge-request: 382 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
committed by
Tobias Hunger
parent
5801841130
commit
08f97b50d7
@@ -456,7 +456,7 @@ bool VCSBaseSubmitEditor::save(QString *errorString, const QString &fileName, bo
|
||||
{
|
||||
const QString fName = fileName.isEmpty() ? d->m_file->fileName() : fileName;
|
||||
Utils::FileSaver saver(fName, QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text);
|
||||
saver.write(fileContents().toLocal8Bit());
|
||||
saver.write(fileContents());
|
||||
if (!saver.finalize(errorString))
|
||||
return false;
|
||||
if (autoSave)
|
||||
@@ -467,9 +467,9 @@ bool VCSBaseSubmitEditor::save(QString *errorString, const QString &fileName, bo
|
||||
return true;
|
||||
}
|
||||
|
||||
QString VCSBaseSubmitEditor::fileContents() const
|
||||
QByteArray VCSBaseSubmitEditor::fileContents() const
|
||||
{
|
||||
return d->m_widget->descriptionText();
|
||||
return d->m_widget->descriptionText().toLocal8Bit();
|
||||
}
|
||||
|
||||
bool VCSBaseSubmitEditor::setFileContents(const QString &contents)
|
||||
@@ -616,7 +616,7 @@ bool VCSBaseSubmitEditor::runSubmitMessageCheckScript(const QString &checkScript
|
||||
tempFilePattern += QDir::separator();
|
||||
tempFilePattern += QLatin1String("msgXXXXXX.txt");
|
||||
Utils::TempFileSaver saver(tempFilePattern);
|
||||
saver.write(fileContents().toUtf8());
|
||||
saver.write(fileContents());
|
||||
if (!saver.finalize(errorMessage))
|
||||
return false;
|
||||
// Run check process
|
||||
|
||||
Reference in New Issue
Block a user