Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf

1 files changed, 13 insertions, 4 deletions

diff --git a/examples/widgets/tools/settingseditor/locationdialog.cpp b/examples/widgets/tools/settingseditor/locationdialog.cpp
index 5b6e2652bb..99c9834a63 100644
--- a/examples/widgets/tools/settingseditor/locationdialog.cpp
+++ b/examples/widgets/tools/settingseditor/locationdialog.cpp
@@ -48,10 +48,20 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "locationdialog.h"
 
+#include <QBoxLayout>
+#include <QComboBox>
+#include <QDialogButtonBox>
+#include <QDir>
+#include <QPushButton>
+#include <QGroupBox>
+#include <QHeaderView>
+#include <QLabel>
+#include <QLineEdit>
+#include <QTableWidget>
+#include <QTableWidgetItem>
+
 LocationDialog::LocationDialog(QWidget *parent)
     : QDialog(parent)
 {
@@ -91,8 +101,7 @@ LocationDialog::LocationDialog(QWidget *parent)
 
     locationsGroupBox = new QGroupBox(tr("Setting Locations"));
 
-    QStringList labels;
-    labels << tr("Location") << tr("Access");
+    const QStringList labels{tr("Location"), tr("Access")};
 
     locationsTable = new QTableWidget;
     locationsTable->setSelectionMode(QAbstractItemView::SingleSelection);