aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-11-12 16:07:44 +0100
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-11-13 10:17:16 +0000
commit976a72a5d90e6e56e764040ad07d8d65aff7ce2a (patch)
treed048c222df3b3065348b3f432585bfb868e5e985
parent37ccef9a0fbdff9276a5ceb86a6dbd5a2120fb8a (diff)
Fix connection warnings on startup with Qt 6
Qt 6 removed the overload for QComboBox::currentIndexChanged(const QString &). Fix the following warnings on startup: qt.core.qmetaobject.connectslotsbyname: QMetaObject::connectSlotsByName: No matching signal for on_easingExtremesComboBox_currentIndexChanged(QString) qt.core.qmetaobject.connectslotsbyname: QMetaObject::connectSlotsByName: No matching signal for on_easingShapeComboBox_currentIndexChanged(QString) Change-Id: Iebfe727ca5c5105e1c6faf61284e3e0f6371da83 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp9
-rw-r--r--src/libs/qmleditorwidgets/easingpane/easingcontextpane.h4
2 files changed, 9 insertions, 4 deletions
diff --git a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
index a794b337a0..7f7c4684dd 100644
--- a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
+++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
@@ -26,6 +26,7 @@
#include "easingcontextpane.h"
#include "ui_easingcontextpane.h"
#include <qmljs/qmljspropertyreader.h>
+#include <utils/qtcassert.h>
#include <utils/utilsicons.h>
#include <QGraphicsPixmapItem>
@@ -287,8 +288,10 @@ void QmlEditorWidgets::EasingContextPane::on_durationSpinBox_valueChanged(int ne
emit propertyChanged(QLatin1String("duration"), newValue);
}
-void QmlEditorWidgets::EasingContextPane::on_easingShapeComboBox_currentIndexChanged(const QString &newShape)
+void QmlEditorWidgets::EasingContextPane::on_easingShapeComboBox_currentIndexChanged(int newIndex)
{
+ QTC_ASSERT(newIndex >= 0, return);
+ const QString newShape = ui->easingShapeComboBox->itemText(newIndex);
if (newShape==QLatin1String("Linear"))
setLinear();
else if (newShape==QLatin1String("Bounce"))
@@ -311,8 +314,10 @@ void QmlEditorWidgets::EasingContextPane::on_easingShapeComboBox_currentIndexCha
}
}
-void QmlEditorWidgets::EasingContextPane::on_easingExtremesComboBox_currentIndexChanged(const QString &newExtremes)
+void QmlEditorWidgets::EasingContextPane::on_easingExtremesComboBox_currentIndexChanged(int newIndex)
{
+ QTC_ASSERT(newIndex >= 0, return);
+ const QString newExtremes = ui->easingExtremesComboBox->itemText(newIndex);
if (m_easingGraph->easingExtremes() != newExtremes) {
m_easingGraph->setEasingExtremes(newExtremes);
m_easingGraph->setAmplitude(ui->amplitudeSpinBox->value());
diff --git a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h
index 3cab9523b5..4c50bf08b3 100644
--- a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h
+++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h
@@ -77,8 +77,8 @@ private slots:
void on_overshootSpinBox_valueChanged(double);
void on_periodSpinBox_valueChanged(double);
void on_amplitudeSpinBox_valueChanged(double);
- void on_easingExtremesComboBox_currentIndexChanged(const QString &);
- void on_easingShapeComboBox_currentIndexChanged(const QString &);
+ void on_easingExtremesComboBox_currentIndexChanged(int);
+ void on_easingShapeComboBox_currentIndexChanged(int);
void on_durationSpinBox_valueChanged(int);
void switchToGraph();