Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I2a6eb9dd7724931bc89f28bcc156e77c4e26d069

1 files changed, 21 insertions, 0 deletions

diff --git a/tests/manual/dialogs/utils.cpp b/tests/manual/dialogs/utils.cpp
index 7e0067c7f3..2dc01359b1 100644
--- a/tests/manual/dialogs/utils.cpp
+++ b/tests/manual/dialogs/utils.cpp
@@ -52,11 +52,23 @@ QComboBox *createCombo(QWidget *parent, const FlagData *d, size_t size)
     return c;
 }
 
+void populateCombo(QComboBox *combo, const FlagData *d, size_t size)
+{
+    for (size_t i = 0; i < size; ++i)
+        combo->addItem(QLatin1String(d[i].description), QVariant(d[i].value));
+}
+
 void setComboBoxValue(QComboBox *c, int v)
 {
     c->setCurrentIndex(c->findData(QVariant(v)));
 }
 
+OptionsControl::OptionsControl(QWidget *parent)
+    : QGroupBox(parent)
+{
+    setLayout(new QVBoxLayout(this));
+}
+
 OptionsControl::OptionsControl(const QString &title, const FlagData *data, size_t count, QWidget *parent)
     : QGroupBox(title, parent)
 {
@@ -68,6 +80,15 @@ OptionsControl::OptionsControl(const QString &title, const FlagData *data, size_
     }
 }
 
+void OptionsControl::populateOptions(const FlagData *data, size_t count)
+{
+    for (size_t i = 0; i < count; ++i) {
+        QCheckBox *box = new QCheckBox(QString::fromLatin1(data[i].description));
+        m_checkBoxes.push_back(CheckBoxFlagPair(box, data[i].value));
+        layout()->addWidget(box);
+    }
+}
+
 void OptionsControl::setValue(int flags)
 {
     foreach (const CheckBoxFlagPair &cf, m_checkBoxes)