diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-02 14:40:30 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-14 17:33:04 +0200 |
| commit | 28aa3324de22fa6bdbbed2fd5536fadf761666dc (patch) | |
| tree | 8a00aafe95a3aea3d5c08785284e37e9b07d273a /qmake/generators/integrity | |
| parent | dfd9ef3469b05af931638f9e5fb7a9dfe99e6c8e (diff) | |
Port away from QString::{to,from}Ascii in qmake
Properly use from/toLocal8Bit when referring to user data, even file
names.
Change-Id: I8fc7afa2ea570f8b1b1eecf354f01d6dfe0883cb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'qmake/generators/integrity')
| -rw-r--r-- | qmake/generators/integrity/gbuild.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/integrity/gbuild.cpp b/qmake/generators/integrity/gbuild.cpp index 895df24193..0d9d81c549 100644 --- a/qmake/generators/integrity/gbuild.cpp +++ b/qmake/generators/integrity/gbuild.cpp @@ -213,7 +213,7 @@ GBuildMakefileGenerator::write() dllbase += DLLOFFSET; } - warn_msg(WarnParser, Option::output.fileName().toAscii().constData()); + warn_msg(WarnParser, Option::output.fileName().toLocal8Bit().constData()); QTextStream t(&Option::output); QString primaryTarget(project->values("QMAKE_CXX").at(0)); @@ -425,7 +425,7 @@ GBuildMakefileGenerator::openOutput(QFile &file, const QString &build) const outputName += QDir::separator(); outputName += fileInfo(project->projectFile()).baseName(); outputName += projectSuffix(); - warn_msg(WarnParser, outputName.toAscii().constData()); + warn_msg(WarnParser, outputName.toLocal8Bit().constData()); file.setFileName(outputName); } debug_msg(1, "file is %s", file.fileName().toLatin1().constData()); |