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

Custom wizard: Introduce 'binary' attribute for source files.

Browse Source 
Indicating the file is to be copied as is and not preprocessed.

Task-number: QTCREATORBUG-2344
This commit is contained in:
Friedemann Kleint
2010-09-14 17:03:08 +02:00
parent 4118d70182
commit 2c2f15dbc6
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/projectexplorer/customwizard/customwizard.cpp
View File

@@ -151,17 +151,30 @@ static inline bool createFile(Internal::CustomWizardFile cwFile,
const QString targetPath = QDir::toNativeSeparators(targetDirectory + slash + cwFile.target);
if (CustomWizardPrivate::verbose)
qDebug() << "generating " << targetPath << sourcePath << fm;
// Read contents of source file
const QFile::OpenMode openMode
= cwFile.binary ? QIODevice::ReadOnly : (QIODevice::ReadOnly|QIODevice::Text);
QFile file(sourcePath);
if (!file.open(QIODevice::ReadOnly|QIODevice::Text)) {
if (!file.open(openMode)) {
*errorMessage = QString::fromLatin1("Cannot open %1: %2").arg(sourcePath, file.errorString());
return false;
}
// Field replacement on contents
const QString contentsIn = QString::fromLocal8Bit(file.readAll());
const QByteArray contentData = file.readAll();
file.close();
Core::GeneratedFile generatedFile;
generatedFile.setContents(Internal::CustomWizardContext::processFile(fm, contentsIn));
generatedFile.setPath(targetPath);
if (cwFile.binary) {
// Binary file: Set data.
generatedFile.setBinary(true);
generatedFile.setBinaryContents(contentData);
} else {
// Template file: Preprocess.
const QString contentsIn = QString::fromLocal8Bit(contentData);
generatedFile.setContents(Internal::CustomWizardContext::processFile(fm, contentsIn));
}
Core::GeneratedFile::Attributes attributes = 0;
if (cwFile.openEditor)
attributes |= Core::GeneratedFile::OpenEditorAttribute;