diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f15f2d..a4f77b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,8 +13,8 @@ set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE project(partitionmanager VERSION ${RELEASE_SERVICE_VERSION}) # Dependencies -set(QT_MIN_VERSION "5.14.0") -set(KF5_MIN_VERSION "5.73") +set(QT_MIN_VERSION "5.15.0") +set(KF5_MIN_VERSION "5.90") set(KPMCORE_MIN_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}") set(CMAKE_USE_RELATIVE_PATHS OFF) @@ -69,7 +69,7 @@ add_definitions( -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_CAST_TO_BYTEARRAY -DQT_USE_FAST_OPERATOR_PLUS - -DQT_DISABLE_DEPRECATED_BEFORE=0x050900 + -DQT_DISABLE_DEPRECATED_BEFORE=0x050f00 -DQT_NO_KEYWORDS ) diff --git a/src/gui/sizedialogbase.cpp b/src/gui/sizedialogbase.cpp index 25a75e5..6e503f6 100644 --- a/src/gui/sizedialogbase.cpp +++ b/src/gui/sizedialogbase.cpp @@ -162,6 +162,7 @@ void SizeDialogBase::setupConnections() connect(&dialogWidget().partResizerWidget(), &PartResizerWidget::firstSectorChanged, this, &SizeDialogBase::onResizerWidgetFirstSectorChanged); connect(&dialogWidget().partResizerWidget(), &PartResizerWidget::lastSectorChanged, this, &SizeDialogBase::onResizerWidgetLastSectorChanged); + // TODO: Qt6 remove qOverload connect(&dialogWidget().spinFreeBefore(), qOverload(&QDoubleSpinBox::valueChanged), this, &SizeDialogBase::onSpinFreeBeforeChanged); connect(&dialogWidget().spinFreeAfter(), qOverload(&QDoubleSpinBox::valueChanged), this, &SizeDialogBase::onSpinFreeAfterChanged); connect(&dialogWidget().spinCapacity(), qOverload(&QDoubleSpinBox::valueChanged), this, &SizeDialogBase::onSpinCapacityChanged); @@ -305,7 +306,7 @@ void SizeDialogBase::onSpinFreeAfterChanged(double newAfter) updateSpinFreeAfter(dialogUnitToSectors(device(), oldAfter)); } -void SizeDialogBase::onSpinFirstSectorChanged(qint64 newFirst) +void SizeDialogBase::onSpinFirstSectorChanged(double newFirst) { if (newFirst >= minimumFirstSector() && dialogWidget().partResizerWidget().updateFirstSector(newFirst)) setDirty(); @@ -315,7 +316,7 @@ void SizeDialogBase::onSpinFirstSectorChanged(qint64 newFirst) updateSpinFirstSector(partition().firstSector()); } -void SizeDialogBase::onSpinLastSectorChanged(qint64 newLast) +void SizeDialogBase::onSpinLastSectorChanged(double newLast) { if (newLast <= maximumLastSector() && dialogWidget().partResizerWidget().updateLastSector(newLast)) setDirty(); diff --git a/src/gui/sizedialogbase.h b/src/gui/sizedialogbase.h index 2d49e08..69116f1 100644 --- a/src/gui/sizedialogbase.h +++ b/src/gui/sizedialogbase.h @@ -117,8 +117,8 @@ protected: void onSpinFreeBeforeChanged(double newBefore); void onSpinFreeAfterChanged(double newAfter); - void onSpinFirstSectorChanged(qint64 newFirst); - void onSpinLastSectorChanged(qint64 newLast); + void onSpinFirstSectorChanged(double newFirst); + void onSpinLastSectorChanged(double newLast); void onAlignToggled(bool); void onLVNameChanged(const QString& newName);