Merge remote-tracking branch 'origin/Applications/17.12'

diff --cc CMakeLists.txt
Simple merge

diff --cc src/kitemviews/kstandarditemlistwidget.h
index b13c303bc173f43b151e1757c080eb6102f960ab,cb7364795237daf1245d499161a62f6536a69270..a9b8322362a79167738fa1a34b77d7cd6115da7e
--- 1/src/kitemviews/kstandarditemlistwidget.h
--- 2/src/kitemviews/kstandarditemlistwidget.h
+++ b/src/kitemviews/kstandarditemlistwidget.h
@@@ -172,22 -172,22 +172,25 @@@ protected
       */
      virtual int selectionLength(const QString& text) const;
  
 -    virtual void dataChanged(const QHash<QByteArray, QVariant>& current, const QSet<QByteArray>& roles = QSet<QByteArray>()) Q_DECL_OVERRIDE;
 -    virtual void visibleRolesChanged(const QList<QByteArray>& current, const QList<QByteArray>& previous) Q_DECL_OVERRIDE;
 -    virtual void columnWidthChanged(const QByteArray& role, qreal current, qreal previous) Q_DECL_OVERRIDE;
 -    virtual void styleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous) Q_DECL_OVERRIDE;
 -    virtual void hoveredChanged(bool hovered) Q_DECL_OVERRIDE;
 -    virtual void selectedChanged(bool selected) Q_DECL_OVERRIDE;
 -    virtual void siblingsInformationChanged(const QBitArray& current, const QBitArray& previous) Q_DECL_OVERRIDE;
 -    virtual void editedRoleChanged(const QByteArray& current, const QByteArray& previous) Q_DECL_OVERRIDE;
 -    virtual void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE;
 -    virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
 -    virtual void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE;
 -    bool event(QEvent *event) Q_DECL_OVERRIDE;
 +    void dataChanged(const QHash<QByteArray, QVariant>& current, const QSet<QByteArray>& roles = QSet<QByteArray>()) override;
 +    void visibleRolesChanged(const QList<QByteArray>& current, const QList<QByteArray>& previous) override;
 +    void columnWidthChanged(const QByteArray& role, qreal current, qreal previous) override;
 +    void styleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous) override;
 +    void hoveredChanged(bool hovered) override;
 +    void selectedChanged(bool selected) override;
 +    void siblingsInformationChanged(const QBitArray& current, const QBitArray& previous) override;
 +    void editedRoleChanged(const QByteArray& current, const QByteArray& previous) override;
 +    void resizeEvent(QGraphicsSceneResizeEvent* event) override;
 +    void showEvent(QShowEvent* event) override;
 +    void hideEvent(QHideEvent* event) override;
 +    bool event(QEvent *event) override;
 +
 +public slots:
 +    void finishRoleEditing();
  
+ public slots:
+     void finishRoleEditing();
+ 
  private slots:
      void slotCutItemsChanged();
      void slotRoleEditingCanceled(const QByteArray& role, const QVariant& value);