diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2012-02-26 15:20:24 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-16 23:02:15 +0100 |
commit | 3abc6be68547e00cd90cfb0fd9151650fe937184 (patch) | |
tree | 36b54a772e9df3b7975af8899fee710f512e1602 /qmake/project.cpp | |
parent | 4d1ad4e4d386b2afb29e8476e21dc8f38262d238 (diff) |
Build qmake with QStringBuilder.
QStringBuilder will be enabled by default so qmake should build with it.
qstringbuiler.cpp has to be compiled in just for the convertFromAscii
(The alternative was to build with QT_NO_CAST_FROM_ASCII, but that would
be too much work)
Change-Id: I1fbeed7ed8a9d3bc38ef591a687c50644980e2fd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'qmake/project.cpp')
-rw-r--r-- | qmake/project.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index b82b793319..1f936a04c2 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -1026,7 +1026,7 @@ QMakeProject::parse(const QString &t, QHash<QString, QStringList> &place, int nu debug_msg(1, "Project Parser: %s:%d : Entering block %d (%d). [%s]", parser.file.toLatin1().constData(), parser.line_no, scope_blocks.count(), scope_failed, s.toLatin1().constData()); } else if(iterator) { - iterator->parselist.append(var+s.mid(d_off)); + iterator->parselist.append(QString(var+s.mid(d_off))); bool ret = iterator->exec(this, place); delete iterator; return ret; |