Merge branch 'Applications/15.08'

This commit is contained in:
David Rosca 2015-09-25 22:40:08 +02:00
commit fb9ca1399d

View file

@ -127,7 +127,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
propsGridLayout->addWidget(sortingLabel, 1, 0, Qt::AlignRight); propsGridLayout->addWidget(sortingLabel, 1, 0, Qt::AlignRight);
propsGridLayout->addWidget(sortingBox, 1, 1); propsGridLayout->addWidget(sortingBox, 1, 1);
QVBoxLayout* propsBoxLayout = new QVBoxLayout(propsBox); QVBoxLayout* propsBoxLayout = propsBox == this ? layout : new QVBoxLayout(propsBox);
propsBoxLayout->addWidget(propsGrid); propsBoxLayout->addWidget(propsGrid);
propsBoxLayout->addWidget(m_sortFoldersFirst); propsBoxLayout->addWidget(m_sortFoldersFirst);
propsBoxLayout->addWidget(m_previewsShown); propsBoxLayout->addWidget(m_previewsShown);