Merge remote-tracking branch 'origin/master' into wip/timeline

Change-Id: I58176ea495831aee6eb35b9057bdecb6f3a6e1fe

1 files changed, 3 insertions, 2 deletions

diff --git a/src/Authoring/Studio/Palettes/Slide/SlideView.cpp b/src/Authoring/Studio/Palettes/Slide/SlideView.cpp
index 38aba9b1..23372aaf 100644
--- a/src/Authoring/Studio/Palettes/Slide/SlideView.cpp
+++ b/src/Authoring/Studio/Palettes/Slide/SlideView.cpp
@@ -120,10 +120,11 @@ void SlideView::showControllerDialog(const QPoint &point)
 {
     QString currCtr = m_currentController.size() ?
         m_currentController : m_dataInputSelector->getNoneString();
-    QStringList dataInputList;
+    QVector<QPair<QString, int>> dataInputList;
     for (int i = 0; i < g_StudioApp.m_dataInputDialogItems.size(); i++) {
         if (g_StudioApp.m_dataInputDialogItems[i]->type == EDataType::DataTypeString)
-            dataInputList.append(g_StudioApp.m_dataInputDialogItems[i]->name);
+            dataInputList.append(QPair<QString, int>(g_StudioApp.m_dataInputDialogItems[i]->name,
+                                                     g_StudioApp.m_dataInputDialogItems[i]->type));
     }
     m_dataInputSelector->setData(dataInputList, currCtr);
     showBrowser(m_dataInputSelector, point);