diff --git a/CMakeLists.txt b/CMakeLists.txt index d5c9a73..290f3e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,13 +77,13 @@ find_package(KF${KF_MAJOR_VERSION}I18n ${KF5_VERSION} REQUIRED) if (NOT WIN32) find_package(KF${KF_MAJOR_VERSION}WidgetsAddons ${KF5_VERSION} REQUIRED) - find_package(KF${KF_MAJOR_VERSION}TextWidgets ${KF5_VERSION} REQUIRED) +# find_package(KF${KF_MAJOR_VERSION}TextWidgets ${KF5_VERSION} REQUIRED) # Optional KF5 frameworks - find_package(KF${KF_MAJOR_VERSION}Wallet ${KF5_VERSION}) - set_package_properties(KF${KF_MAJOR_VERSION}Wallet PROPERTIES DESCRIPTION "Safe desktop-wide storage for passwords" TYPE OPTIONAL - PURPOSE "Required to have permanent storage of passwords for scanners" - ) +# find_package(KF${KF_MAJOR_VERSION}Wallet ${KF5_VERSION}) +# set_package_properties(KF${KF_MAJOR_VERSION}Wallet PROPERTIES DESCRIPTION "Safe desktop-wide storage for passwords" TYPE OPTIONAL +# PURPOSE "Required to have permanent storage of passwords for scanners" +# ) # Check if sane API is available. find_package(${KSANECORE_NAME} "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}" REQUIRED) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ab07811..48686b7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -73,7 +73,7 @@ target_link_libraries(KSaneWidgets PRIVATE KF${KF_MAJOR_VERSION}::I18n KF${KF_MAJOR_VERSION}::WidgetsAddons - KF${KF_MAJOR_VERSION}::TextWidgets +# KF${KF_MAJOR_VERSION}::TextWidgets ${KSANECORE_TARGET} ) diff --git a/src/widgets/labeledslider.cpp b/src/widgets/labeledslider.cpp index dc5a39b..312079d 100644 --- a/src/widgets/labeledslider.cpp +++ b/src/widgets/labeledslider.cpp @@ -10,10 +10,11 @@ #include #include +#include // KDE includes -#include +#include #include namespace KSaneIface @@ -90,7 +91,7 @@ void LabeledSlider::initSlider(int minValue, int maxValue, int stepValue) m_slider->setMaximum(maxValue); m_slider->setSingleStep(m_step); - m_spinb = new KPluralHandlingSpinBox(this); + m_spinb = new QSpinBox(this); m_spinb->setMinimum(minValue); m_spinb->setMaximum(maxValue); m_slider->setSingleStep(m_step); @@ -114,7 +115,7 @@ void LabeledSlider::initSlider(int minValue, int maxValue, int stepValue) void LabeledSlider::setSuffix(const KLocalizedString &text) { - m_spinb->setSuffix(text); + m_spinb->setSuffix(text.toString()); } void LabeledSlider::setValue(const QVariant &val) diff --git a/src/widgets/labeledslider.h b/src/widgets/labeledslider.h index fe1bd4c..b9f5460 100644 --- a/src/widgets/labeledslider.h +++ b/src/widgets/labeledslider.h @@ -10,7 +10,8 @@ #include "ksaneoptionwidget.h" -class QSlider; +#include +#include /** *@author Kåre Särs @@ -78,7 +79,7 @@ Q_SIGNALS: private: void initSlider(int minValue, int maxValue, int stepValue); QSlider *m_slider; - KPluralHandlingSpinBox *m_spinb; + QSpinBox *m_spinb; int m_step; };