Merge branch 'Applications/17.08'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c568ca3c9687eced1c15bc8563fdc66a3136c31..1ab84b95053c1e198ac67133366343e4bc629d2a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,8 +4,8 @@ project(Dolphin)
 
 # KDE Application Version, managed by release script
 set (KDE_APPLICATIONS_VERSION_MAJOR "17")
-set (KDE_APPLICATIONS_VERSION_MINOR "07")
-set (KDE_APPLICATIONS_VERSION_MICRO "80")
+set (KDE_APPLICATIONS_VERSION_MINOR "11")
+set (KDE_APPLICATIONS_VERSION_MICRO "70")
 set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
 
 set(QT_MIN_VERSION "5.5.0")

diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp
index f01d220dda50d9d0519eb6cdec312e87d31e639c..1a92cd16c30380a5da9fe112b5e258f6b9c0a955 100644 (file)
--- a/src/settings/general/previewssettingspage.cpp
+++ b/src/settings/general/previewssettingspage.cpp
@@ -81,7 +81,7 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
     m_remoteFileSizeBox->setSuffix(QStringLiteral(" MB"));
     m_remoteFileSizeBox->setRange(0, 9999999); /* MB */
 
-    QHBoxLayout* fileSizeBoxLayout = new QHBoxLayout(this);
+    QHBoxLayout* fileSizeBoxLayout = new QHBoxLayout();
     fileSizeBoxLayout->addWidget(remoteFileSizeLabel, 0, Qt::AlignRight);
     fileSizeBoxLayout->addWidget(m_remoteFileSizeBox);
 

diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp
index 632ae99da7eac3ff08933a35e70f008611eb3a02..a673769ade679fce5c42debee6848729399995ae 100644 (file)
--- a/src/settings/viewmodes/viewsettingstab.cpp
+++ b/src/settings/viewmodes/viewsettingstab.cpp
@@ -133,7 +133,9 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) :
 
     topLayout->addWidget(iconSizeGroup);
     topLayout->addWidget(textGroup);
-    topLayout->addWidget(m_expandableFolders);
+    if (m_expandableFolders) {
+        topLayout->addWidget(m_expandableFolders);
+    }
     topLayout->addStretch(1);
 
     loadSettings();