Qt Designer: Fix deprecation warnings

shared/previewconfigurationwidget.cpp:268:34: warning: ‘DirectoryOnly’ is deprecated: Use setOption(ShowDirsOnly, true) instead [-Wdeprecated-declarations]
     dlg.setFileMode(QFileDialog::DirectoryOnly);
shared/qttoolbardialog/qttoolbardialog.cpp:1139:31: warning: ‘TextColorRole’ is deprecated [-Wdeprecated-declarations]

Change-Id: Ia989156baf35c2be6f763c067da9440d0b2c7dee
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>

2 files changed, 6 insertions, 5 deletions

diff --git a/src/designer/src/lib/shared/previewconfigurationwidget.cpp b/src/designer/src/lib/shared/previewconfigurationwidget.cpp
index fc7765cea..6352468c3 100644
--- a/src/designer/src/lib/shared/previewconfigurationwidget.cpp
+++ b/src/designer/src/lib/shared/previewconfigurationwidget.cpp
@@ -265,7 +265,8 @@ void PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate::storeSetting
 int  PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate::browseSkin()
 {
     QFileDialog dlg(m_parent);
-    dlg.setFileMode(QFileDialog::DirectoryOnly);
+    dlg.setFileMode(QFileDialog::Directory);
+    dlg.setOption(QFileDialog::ShowDirsOnly);
     const QString title = tr("Load Custom Device Skin");
     dlg.setWindowTitle(title);
     dlg.setNameFilter(tr("All QVFB Skins (*.%1)").arg(QLatin1String(skinExtensionC)));
diff --git a/src/shared/qttoolbardialog/qttoolbardialog.cpp b/src/shared/qttoolbardialog/qttoolbardialog.cpp
index edad7215a..4df2d00d5 100644
--- a/src/shared/qttoolbardialog/qttoolbardialog.cpp
+++ b/src/shared/qttoolbardialog/qttoolbardialog.cpp
@@ -1106,7 +1106,7 @@ void QtToolBarDialogPrivate::fillNew()
             actionToItem.insert(action, item);
             itemToAction.insert(item, action);
             if (toolBarManager->isWidgetAction(action)) {
-                item->setData(0, Qt::TextColorRole, QColor(Qt::blue));
+                item->setData(0, Qt::ForegroundRole, QColor(Qt::blue));
                 widgetActionToToolBar.insert(action, 0);
             }
             item->setFlags(item->flags() | Qt::ItemIsDragEnabled);
@@ -1136,7 +1136,7 @@ void QtToolBarDialogPrivate::fillNew()
         if (it == toolBars.constBegin())
             ui.toolBarList->setCurrentItem(item);
         if (isDefaultToolBar(tbItem))
-            item->setData(Qt::TextColorRole, QColor(Qt::darkGreen));
+            item->setData(Qt::ForegroundRole, QColor(Qt::darkGreen));
         else
             item->setFlags(item->flags() | Qt::ItemIsEditable);
 
@@ -1432,7 +1432,7 @@ void QtToolBarDialogPrivate::rightClicked()
             currentItemToAction.insert(item, action);
             actionToCurrentItem.insert(action, item);
             if (widgetActionToToolBar.contains(action)) {
-                item->setData(Qt::TextColorRole, QColor(Qt::blue));
+                item->setData(Qt::ForegroundRole, QColor(Qt::blue));
                 ToolBarItem *toolBar = widgetActionToToolBar.value(action);
                 if (toolBar) {
                     currentState[toolBar].removeAll(action);
@@ -1512,7 +1512,7 @@ void QtToolBarDialogPrivate::currentToolBarChanged(QListWidgetItem *current)
             item->setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter | Qt::TextShowMnemonic);
             actionToCurrentItem.insert(action, item);
             if (widgetActionToToolBar.contains(action))
-                item->setData(Qt::TextColorRole, QColor(Qt::blue));
+                item->setData(Qt::ForegroundRole, QColor(Qt::blue));
         }
         currentItemToAction.insert(item, action);
         if (!first)