diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-03-19 13:13:31 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-03-19 13:13:31 +0100 |
| commit | 7ba225cb79c2d83bf7ed5dd249747541dd27a963 (patch) | |
| tree | 7afe909d92805ab0233dddb4bc796596a74df878 /src/plugins | |
| parent | 67e5eabc4af630c02ab15700f596b131c70b6ed8 (diff) | |
| parent | cabbeb1c5450b67ba649d77474b892d5acb0d622 (diff) | |
| download | qt-creator-7ba225cb79c2d83bf7ed5dd249747541dd27a963.tar.gz | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
Change-Id: Ifd9524b0155067faf9d8a90858cc5f7da6b651bf
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/projectexplorer/foldernavigationwidget.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/projectexplorer/projectmodels.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp index 43dbf18aa0..cafa8cd5cd 100644 --- a/src/plugins/projectexplorer/foldernavigationwidget.cpp +++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp @@ -273,6 +273,7 @@ FolderNavigationWidget::FolderNavigationWidget(QWidget *parent) : QWidget(parent setHiddenFilesFilter(false); m_showBreadCrumbsAction->setCheckable(true); setShowBreadCrumbs(true); + m_listView->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel); m_listView->setIconSize(QSize(16,16)); m_listView->setModel(m_fileSystemModel); m_listView->setEditTriggers(QAbstractItemView::NoEditTriggers); diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp index a6512d0b3b..558ae45a6a 100644 --- a/src/plugins/projectexplorer/projectmodels.cpp +++ b/src/plugins/projectexplorer/projectmodels.cpp @@ -86,7 +86,9 @@ FlatModel::FlatModel(QObject *parent) connect(sm, &SessionManager::aboutToSaveSession, this, &FlatModel::saveExpandData); connect(sm, &SessionManager::projectAdded, this, &FlatModel::handleProjectAdded); connect(sm, &SessionManager::startupProjectChanged, this, [this] { layoutChanged(); }); - rebuildModel(); + + for (Project *project : SessionManager::projects()) + handleProjectAdded(project); } QVariant FlatModel::data(const QModelIndex &index, int role) const |