diff options
| author | David Rosca <[email protected]> | 2015-09-25 22:40:08 +0200 |
|---|---|---|
| committer | David Rosca <[email protected]> | 2015-09-25 22:40:08 +0200 |
| commit | fb9ca1399dc97aebf0d4776e87e701ea0ab56ba1 (patch) | |
| tree | c97a6ac311414e255335e3d16f3c73d2feaedefc /src | |
| parent | 8a56637663a6c5305b9ec244588e50eb8399e95b (diff) | |
| parent | e6af789224cdf65cecf147853078d7c3338889fb (diff) | |
Merge branch 'Applications/15.08'
Diffstat (limited to 'src')
| -rw-r--r-- | src/settings/viewpropertiesdialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp index be7fe0d86..dc033365f 100644 --- a/src/settings/viewpropertiesdialog.cpp +++ b/src/settings/viewpropertiesdialog.cpp @@ -127,7 +127,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : propsGridLayout->addWidget(sortingLabel, 1, 0, Qt::AlignRight); propsGridLayout->addWidget(sortingBox, 1, 1); - QVBoxLayout* propsBoxLayout = new QVBoxLayout(propsBox); + QVBoxLayout* propsBoxLayout = propsBox == this ? layout : new QVBoxLayout(propsBox); propsBoxLayout->addWidget(propsGrid); propsBoxLayout->addWidget(m_sortFoldersFirst); propsBoxLayout->addWidget(m_previewsShown); |