diff options
| author | Leandro Melo <leandro.melo@nokia.com> | 2011-09-06 11:28:47 +0200 |
|---|---|---|
| committer | Leandro T. C. Melo <leandro.melo@nokia.com> | 2011-09-06 13:58:03 +0200 |
| commit | b2374640457c4594d4d4b9a21d02be61921253eb (patch) | |
| tree | d623b4c1552c3dce3560d18f7beed198e03498d6 /src/plugins/cpptools/cppmodelmanager.cpp | |
| parent | a2e9fadb61c909e46146fb4dbd31eabe6edd6e89 (diff) | |
| download | qt-creator-b2374640457c4594d4d4b9a21d02be61921253eb.tar.gz | |
C++: Normalize line ending for preprocessing
There is logic in the preprocessor that assumes a normalized line
ending. Other patches have already fixed the issue in other parts.
Change-Id: Iac262da361b6528cc9466a6c87e83da95af9ea04
Reviewed-on: http://codereview.qt.nokia.com/4252
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 6856bc1f97..274d3e236a 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -332,7 +332,7 @@ bool CppPreprocessor::includeFile(const QString &absoluteFilePath, QString *resu return false; QFile file(absoluteFilePath); - if (file.open(QFile::ReadOnly)) { + if (file.open(QFile::ReadOnly | QFile::Text)) { m_included.insert(absoluteFilePath); QTextStream stream(&file); const QString contents = stream.readAll(); |