diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(SetKPropertyCMakePolicies NO_POLICY_SCOPE) -project(KProperty VERSION 3.2.0) # Update this +project(KProperty VERSION 3.2.90) # Update this: Alpha = 90, Beta 1 = 91, RC 1 = 94 # CMake include(CMakePackageConfigHelpers) diff --git a/src/editors/3rdparty/KColorCombo.h b/src/editors/3rdparty/KColorCombo.h --- a/src/editors/3rdparty/KColorCombo.h +++ b/src/editors/3rdparty/KColorCombo.h @@ -98,7 +98,7 @@ void highlighted(const QColor &col); protected: - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) override; private: friend class KColorComboPrivate; diff --git a/src/editors/3rdparty/KColorCombo.cpp b/src/editors/3rdparty/KColorCombo.cpp --- a/src/editors/3rdparty/KColorCombo.cpp +++ b/src/editors/3rdparty/KColorCombo.cpp @@ -40,8 +40,8 @@ KColorComboDelegate(QObject *parent = 0); virtual ~KColorComboDelegate(); - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE; - QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; }; static QBrush k_colorcombodelegate_brush(const QModelIndex &index, int role) diff --git a/src/editors/KPropertyMultiLineStringEditor.h b/src/editors/KPropertyMultiLineStringEditor.h --- a/src/editors/KPropertyMultiLineStringEditor.h +++ b/src/editors/KPropertyMultiLineStringEditor.h @@ -45,8 +45,8 @@ void slotTextChanged(); protected: - bool eventFilter(QObject *o, QEvent *ev) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent * event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *o, QEvent *ev) override; + void paintEvent(QPaintEvent * event) override; private: Q_DISABLE_COPY(KPropertyMultiLineStringEditor) diff --git a/src/editors/coloredit.h b/src/editors/coloredit.h --- a/src/editors/coloredit.h +++ b/src/editors/coloredit.h @@ -48,7 +48,7 @@ void slotValueChanged(const QColor&); protected: - bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE; + bool eventFilter(QObject *o, QEvent *e) override; private: Q_DISABLE_COPY(KPropertyColorComboEditor)