diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-08-10 20:55:39 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-09-14 13:49:45 +0000 |
| commit | 45c56d19ced917a1786aa5dd41941eb435497379 (patch) | |
| tree | 279a6b7df9bfd3a6687e80397505e2b246957fdf | |
| parent | ebd3d246804f4951c6e518889e1560bae47b348c (diff) | |
| download | qttools-45c56d19ced917a1786aa5dd41941eb435497379.tar.gz | |
qmake: prune obsolete QString::detach() call
no m_tmp is involved any more in this code path; it uses QStringRef.
amends 14893e2893.
Change-Id: Ib272d61edfb150a549c5e6a9a60d53502702e802
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from qtbase/9f98935d33cc15c938be2b9295ba2fbe4edb0ee0)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| -rw-r--r-- | src/linguist/shared/qmakeevaluator.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/linguist/shared/qmakeevaluator.cpp b/src/linguist/shared/qmakeevaluator.cpp index daabc032f..41e1a397d 100644 --- a/src/linguist/shared/qmakeevaluator.cpp +++ b/src/linguist/shared/qmakeevaluator.cpp @@ -1628,9 +1628,7 @@ bool QMakeEvaluator::isActiveConfig(const QStringRef &config, bool regex) return m_hostBuild; if (regex && (config.contains(QLatin1Char('*')) || config.contains(QLatin1Char('?')))) { - QString cfg = config.toString(); - cfg.detach(); // Keep m_tmp out of QRegExp's cache - QRegExp re(cfg, Qt::CaseSensitive, QRegExp::Wildcard); + QRegExp re(config.toString(), Qt::CaseSensitive, QRegExp::Wildcard); // mkspecs if (re.exactMatch(m_qmakespecName)) |