aboutsummaryrefslogtreecommitdiffstats
path: root/datasources
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2019-09-30 13:22:32 +0200
committerEike Ziller <eike.ziller@qt.io>2019-09-30 11:39:23 +0000
commit0c85de69dbe46a46af7f3dbe607b57a6d0db5eb3 (patch)
tree6e20b280576284cadc0f7e2e437952daed435e2e /datasources
parent821cfa27631d79b6b35250dd8dbaa673921adfc6 (diff)
Fix build with GCC 5(.5)
Task-number: QTCREATORBUG-22862 Change-Id: Iebfb84af2c5cd530a447f2b8a8296fcc171327d8 Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'datasources')
-rw-r--r--datasources/examplesdatasource.cpp3
-rw-r--r--datasources/qmldesignerusagetimesource.cpp2
-rw-r--r--datasources/qtclicensesource.cpp3
3 files changed, 5 insertions, 3 deletions
diff --git a/datasources/examplesdatasource.cpp b/datasources/examplesdatasource.cpp
index 7d5e909..8dc9b2d 100644
--- a/datasources/examplesdatasource.cpp
+++ b/datasources/examplesdatasource.cpp
@@ -105,7 +105,8 @@ void ExamplesDataSource::updateOpenedExamples()
for (auto project : ProjectExplorer::SessionManager::projects()) {
if (project) {
auto projectPath = QDir::fromNativeSeparators(project->projectFilePath().toString());
- if (auto match = re.match(projectPath); match.hasMatch()) {
+ const auto match = re.match(projectPath);
+ if (match.hasMatch()) {
m_examplePaths << match.captured(examplePathGroupName());
}
}
diff --git a/datasources/qmldesignerusagetimesource.cpp b/datasources/qmldesignerusagetimesource.cpp
index 6f983e7..6bb4a32 100644
--- a/datasources/qmldesignerusagetimesource.cpp
+++ b/datasources/qmldesignerusagetimesource.cpp
@@ -49,7 +49,7 @@ QmlDesignerUsageTimeSource::QmlDesignerUsageTimeSource()
: TimeUsageSourceBase(QStringLiteral("qmlDesignerUsageTime"))
{
connect(Core::ModeManager::instance(), &Core::ModeManager::currentModeChanged,
- this, [this](auto &&modeId){
+ this, [this](Core::Id modeId){
updateTrackingState(QString::fromUtf8(modeId.name().toLower())); });
connect(Core::EditorManager::instance(), &Core::EditorManager::currentEditorChanged,
diff --git a/datasources/qtclicensesource.cpp b/datasources/qtclicensesource.cpp
index 3bf7907..bee2c8c 100644
--- a/datasources/qtclicensesource.cpp
+++ b/datasources/qtclicensesource.cpp
@@ -81,7 +81,8 @@ static bool hasEvaluationLicense(ExtensionSystem::IPlugin *plugin)
static QString licenseString()
{
const auto plugins = ExtensionSystem::PluginManager::plugins();
- if (auto it = std::find_if(plugins.begin(), plugins.end(), &isLicenseChecker); it != plugins.end()) {
+ const auto it = std::find_if(plugins.begin(), plugins.end(), &isLicenseChecker);
+ if (it != plugins.end()) {
return hasEvaluationLicense((*it)->plugin()) ? evaluationStr: commercialStr;
}