diff options
| -rw-r--r-- | doc/qtcreator-online.qdocconf | 2 | ||||
| -rw-r--r-- | src/app/app_version.h.in | 2 | ||||
| -rw-r--r-- | src/shared/proparser/profileevaluator.cpp | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/doc/qtcreator-online.qdocconf b/doc/qtcreator-online.qdocconf index e2a875c30ba..7d54136d41e 100644 --- a/doc/qtcreator-online.qdocconf +++ b/doc/qtcreator-online.qdocconf @@ -4,7 +4,7 @@ include(config/qtcreator-project.qdocconf) HTML.footer = \ " </div>\n" \ " <p class=\"copy-notice\">\n" \ - " <acronym title=\"Copyright\">©</acronym> 2016 The Qt Company Ltd.\n" \ + " <acronym title=\"Copyright\">©</acronym> 2017 The Qt Company Ltd.\n" \ " Documentation contributions included herein are the copyrights of\n" \ " their respective owners. " \ " The documentation provided herein is licensed under the terms of the" \ 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, |