feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Do not use tr() in initialization of static

Browse Source 
Leads to issues at load time

Change-Id: Ibf13c88d05b15f6169f3a82a0e1d66c10bff7991
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Eike Ziller
2017-09-18 14:59:17 +02:00
parent 83f5face41
commit 5457a2b505
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/foldernavigationwidget.cpp
View File

@@ -59,8 +59,7 @@ namespace Internal {
static FolderNavigationWidgetFactory *m_instance = nullptr; static FolderNavigationWidgetFactory *m_instance = nullptr;
QVector<FolderNavigationWidgetFactory::DirectoryEntry> QVector<FolderNavigationWidgetFactory::DirectoryEntry>
FolderNavigationWidgetFactory::m_rootDirectories = { FolderNavigationWidgetFactory::m_rootDirectories;
{FolderNavigationWidget::tr("Computer"), Utils::FileName()}};
// FolderNavigationModel: Shows path as tooltip. // FolderNavigationModel: Shows path as tooltip.
class FolderNavigationModel : public QFileSystemModel class FolderNavigationModel : public QFileSystemModel
@@ -344,6 +343,7 @@ FolderNavigationWidgetFactory::FolderNavigationWidgetFactory()
setPriority(400); setPriority(400);
setId("File System"); setId("File System");
setActivationSequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+Y") : tr("Alt+Y"))); setActivationSequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+Y") : tr("Alt+Y")));
addRootDirectory(FolderNavigationWidget::tr("Computer"), Utils::FileName());
} }
Core::NavigationView FolderNavigationWidgetFactory::createWidget() Core::NavigationView FolderNavigationWidgetFactory::createWidget()