From 5457a2b505df5e7ef8cd3e469ff7332fb5bba7e6 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 18 Sep 2017 14:59:17 +0200 Subject: [PATCH] Do not use tr() in initialization of static Leads to issues at load time Change-Id: Ibf13c88d05b15f6169f3a82a0e1d66c10bff7991 Reviewed-by: Tim Jenssen --- src/plugins/projectexplorer/foldernavigationwidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp index 2733b891bae..797c0c2b15b 100644 --- a/src/plugins/projectexplorer/foldernavigationwidget.cpp +++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp @@ -59,8 +59,7 @@ namespace Internal { static FolderNavigationWidgetFactory *m_instance = nullptr; QVector - FolderNavigationWidgetFactory::m_rootDirectories = { - {FolderNavigationWidget::tr("Computer"), Utils::FileName()}}; + FolderNavigationWidgetFactory::m_rootDirectories; // FolderNavigationModel: Shows path as tooltip. class FolderNavigationModel : public QFileSystemModel @@ -344,6 +343,7 @@ FolderNavigationWidgetFactory::FolderNavigationWidgetFactory() setPriority(400); setId("File System"); setActivationSequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+Y") : tr("Alt+Y"))); + addRootDirectory(FolderNavigationWidget::tr("Computer"), Utils::FileName()); } Core::NavigationView FolderNavigationWidgetFactory::createWidget()