diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-01-25 16:27:49 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-01-25 16:27:49 +0100 |
| commit | a93fc0a4fecada3a1ae0b897ff71e7f7b5b73f3b (patch) | |
| tree | 656f37741fa6a2bef17e46388da377b2cecbb79b /src | |
| parent | 3c743346b07e0a80817737580bfa6d6c556c88e2 (diff) | |
| parent | 23a2eff60dff034de15d041fca11d712bfa02922 (diff) | |
Merge remote-tracking branch 'origin/4.2'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
Change-Id: Ia6083434a811fc975696edf126df101ec8040f49
Diffstat (limited to 'src')
| -rw-r--r-- | src/app/app_version.h.in | 2 | ||||
| -rw-r--r-- | src/shared/proparser/profileevaluator.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/app/app_version.h.in b/src/app/app_version.h.in index b48d6bee4c1..0e622901e13 100644 --- a/src/app/app_version.h.in +++ b/src/app/app_version.h.in @@ -40,7 +40,7 @@ namespace Constants { const char * const IDE_VERSION_LONG = IDE_VERSION_STR; const char * const IDE_AUTHOR = \"The Qt Company Ltd\"; -const char * const IDE_YEAR = \"2016\"; +const char * const IDE_YEAR = \"2017\"; #ifdef IDE_VERSION_DESCRIPTION const char * const IDE_VERSION_DESCRIPTION_STR = STRINGIFY(IDE_VERSION_DESCRIPTION); diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp index 99f4fe02625..60319672a4c 100644 --- a/src/shared/proparser/profileevaluator.cpp +++ b/src/shared/proparser/profileevaluator.cpp @@ -152,6 +152,10 @@ QVector<ProFileEvaluator::SourceFile> ProFileEvaluator::absoluteFileValues( } { int nameOff = absEl.lastIndexOf(QLatin1Char('/')); + if (nameOff < 0) { + // The entry is garbage (possibly after env var expansion) + goto next; + } QString absDir = d->m_tmp1.setRawData(absEl.constData(), nameOff); if (IoUtils::exists(absDir)) { QString wildcard = d->m_tmp2.setRawData(absEl.constData() + nameOff + 1, |