summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
Diffstat (limited to 'qmake')
-rw-r--r--qmake/library/proitems.cpp3
-rw-r--r--qmake/library/proitems.h1
2 files changed, 2 insertions, 2 deletions
diff --git a/qmake/library/proitems.cpp b/qmake/library/proitems.cpp
index 85569ecd82..db19794bec 100644
--- a/qmake/library/proitems.cpp
+++ b/qmake/library/proitems.cpp
@@ -156,7 +156,8 @@ QString ProString::toQString() const
QString &ProString::toQString(QString &tmp) const
{
- return tmp.setRawData(m_string.constData() + m_offset, m_length);
+ tmp = m_string.mid(m_offset, m_length);
+ return tmp;
}
/*
diff --git a/qmake/library/proitems.h b/qmake/library/proitems.h
index 6e091354e4..bef93795d2 100644
--- a/qmake/library/proitems.h
+++ b/qmake/library/proitems.h
@@ -270,7 +270,6 @@ class ProStringRoUser
public:
ProStringRoUser(QString &rs)
{
- Q_ASSERT(rs.isDetached() || rs.isEmpty());
m_rs = &rs;
}
ProStringRoUser(const ProString &ps, QString &rs)