Hello community, here is the log from the commit of package kdeclarative for openSUSE:Factory checked in at 2019-10-14 13:34:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeclarative (Old) and /work/SRC/openSUSE:Factory/.kdeclarative.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdeclarative" Mon Oct 14 13:34:39 2019 rev:73 rq:738018 version:5.63.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdeclarative/kdeclarative.changes 2019-09-23 12:22:20.569758346 +0200 +++ /work/SRC/openSUSE:Factory/.kdeclarative.new.2352/kdeclarative.changes 2019-10-14 13:34:43.562457072 +0200 @@ -1,0 +2,14 @@ +Sun Oct 6 13:26:25 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Update to 5.63.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.63.0.php +- Changes since 5.62.0: + * Delete QQmlObjectSharedEngine context in sync with QQmlObject + * [KDeclarative] Port away from deprecated QWheelEvent methods + * [KDeclarative] Port from deprecated QWheelEvent::delta() to angleDelta() + * [KDeclarative] Port away from deprecated QQuickWindow::sendEvent + * [KDeclarative autotests] Replace fork of old modeltest with QAbstractItemModelTester + +------------------------------------------------------------------- Old: ---- kdeclarative-5.62.0.tar.xz kdeclarative-5.62.0.tar.xz.sig New: ---- kdeclarative-5.63.0.tar.xz kdeclarative-5.63.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeclarative.spec ++++++ --- /var/tmp/diff_new_pack.aFzYa3/_old 2019-10-14 13:34:44.146455550 +0200 +++ /var/tmp/diff_new_pack.aFzYa3/_new 2019-10-14 13:34:44.146455550 +0200 @@ -17,14 +17,14 @@ %define lname libKF5Declarative5 -%define _tar_path 5.62 +%define _tar_path 5.63 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kdeclarative -Version: 5.62.0 +Version: 5.63.0 Release: 0 Summary: Integration of QML and KDE workspaces License: LGPL-2.1-or-later @@ -51,11 +51,11 @@ BuildRequires: cmake(KF5Package) >= %{_kf5_bugfix_version} BuildRequires: cmake(KF5WidgetsAddons) >= %{_kf5_bugfix_version} BuildRequires: cmake(KF5WindowSystem) >= %{_kf5_bugfix_version} -BuildRequires: cmake(Qt5Core) >= 5.6.0 -BuildRequires: cmake(Qt5Gui) >= 5.6.0 -BuildRequires: cmake(Qt5Qml) >= 5.6.0 -BuildRequires: cmake(Qt5Quick) >= 5.6.0 -BuildRequires: cmake(Qt5Test) >= 5.6.0 +BuildRequires: cmake(Qt5Core) >= 5.11.0 +BuildRequires: cmake(Qt5Gui) >= 5.11.0 +BuildRequires: cmake(Qt5Qml) >= 5.11.0 +BuildRequires: cmake(Qt5Quick) >= 5.11.0 +BuildRequires: cmake(Qt5Test) >= 5.11.0 %description KDeclarative provides integration of QML and KDE workspaces. @@ -113,7 +113,7 @@ Requires: cmake(KF5Config) >= %{_kf5_bugfix_version} Requires: cmake(KF5CoreAddons) >= %{_kf5_bugfix_version} Requires: cmake(KF5Package) >= %{_kf5_bugfix_version} -Requires: cmake(Qt5Qml) >= 5.6.0 +Requires: cmake(Qt5Qml) >= 5.11.0 %description devel KDeclarative provides integration of QML and KDE workspaces. ++++++ kdeclarative-5.62.0.tar.xz -> kdeclarative-5.63.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.62.0/CMakeLists.txt new/kdeclarative-5.63.0/CMakeLists.txt --- old/kdeclarative-5.62.0/CMakeLists.txt 2019-09-07 15:57:15.000000000 +0200 +++ new/kdeclarative-5.63.0/CMakeLists.txt 2019-10-06 11:44:03.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.62.0") # handled by release scripts -set(KF5_DEP_VERSION "5.62.0") # handled by release scripts +set(KF5_VERSION "5.63.0") # handled by release scripts +set(KF5_DEP_VERSION "5.63.0") # handled by release scripts project(KDeclarative VERSION ${KF5_VERSION}) # Dependencies include(FeatureSummary) -find_package(ECM 5.62.0 NO_MODULE) +find_package(ECM 5.63.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -31,7 +31,7 @@ ######################################################################### -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) #add_definitions(-Wno-deprecated) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.62.0/autotests/CMakeLists.txt new/kdeclarative-5.63.0/autotests/CMakeLists.txt --- old/kdeclarative-5.62.0/autotests/CMakeLists.txt 2019-09-07 15:57:15.000000000 +0200 +++ new/kdeclarative-5.63.0/autotests/CMakeLists.txt 2019-10-06 11:44:03.000000000 +0200 @@ -6,7 +6,6 @@ ecm_add_test(columnproxymodeltest.cpp ../src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.cpp - modeltest.cpp TEST_NAME fullmodelaccesstest LINK_LIBRARIES Qt5::Gui Qt5::Test) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.62.0/autotests/columnproxymodeltest.cpp new/kdeclarative-5.63.0/autotests/columnproxymodeltest.cpp --- old/kdeclarative-5.62.0/autotests/columnproxymodeltest.cpp 2019-09-07 15:57:15.000000000 +0200 +++ new/kdeclarative-5.63.0/autotests/columnproxymodeltest.cpp 2019-10-06 11:44:03.000000000 +0200 @@ -18,7 +18,7 @@ */ #include "columnproxymodeltest.h" #include "../src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.h" -#include "modeltest.h" +#include <QAbstractItemModelTester> #include <qtest.h> #include <QSignalSpy> #include <QStandardItemModel> @@ -32,7 +32,7 @@ ColumnProxyModel* listify = new ColumnProxyModel; QSignalSpy spy(listify, SIGNAL(rowsInserted(QModelIndex,int,int))); - new ModelTest(listify, listify); + new QAbstractItemModelTester(listify, listify); QStandardItemModel* m = new QStandardItemModel(listify); listify->setRootIndex(QModelIndex()); listify->setSourceModel(m); @@ -50,12 +50,12 @@ QCOMPARE(spy.count(), 5); ColumnProxyModel* listifyB = new ColumnProxyModel; - new ModelTest(listifyB, listifyB); + new QAbstractItemModelTester(listifyB, listifyB); listifyB->setSourceModel(m); QCOMPARE(listifyB->rowCount(), 5); ColumnProxyModel* listifyC = new ColumnProxyModel; - new ModelTest(listifyC, listifyC); + new QAbstractItemModelTester(listifyC, listifyC); listifyC->setRootIndex(item->index()); QCOMPARE(listifyC->rowCount(), 3); @@ -69,7 +69,7 @@ ColumnProxyModel* listify = new ColumnProxyModel; QSignalSpy spy(listify, SIGNAL(rowsInserted(QModelIndex,int,int))); - new ModelTest(listify, listify); + new QAbstractItemModelTester(listify, listify); QStandardItemModel* m = new QStandardItemModel(listify); listify->setRootIndex(QModelIndex()); listify->setSourceModel(m); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.62.0/autotests/modeltest.cpp new/kdeclarative-5.63.0/autotests/modeltest.cpp --- old/kdeclarative-5.62.0/autotests/modeltest.cpp 2019-09-07 15:57:15.000000000 +0200 +++ new/kdeclarative-5.63.0/autotests/modeltest.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,563 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation ([email protected]) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at [email protected]. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include "modeltest.h" - - -#include <QtTest> -//#undef Q_ASSERT -//#define Q_ASSERT QVERIFY - -Q_DECLARE_METATYPE ( QModelIndex ) - -/*! - Connect to all of the models signals. Whenever anything happens recheck everything. -*/ -ModelTest::ModelTest ( QAbstractItemModel *_model, QObject *parent ) : QObject ( parent ), model ( _model ), fetchingMore ( false ) -{ - Q_ASSERT ( model ); - - connect ( model, SIGNAL (columnsAboutToBeInserted(QModelIndex,int,int)), - this, SLOT (runAllTests()) ); - connect ( model, SIGNAL (columnsAboutToBeRemoved(QModelIndex,int,int)), - this, SLOT (runAllTests()) ); - connect ( model, SIGNAL (columnsInserted(QModelIndex,int,int)), - this, SLOT (runAllTests()) ); - connect ( model, SIGNAL (columnsRemoved(QModelIndex,int,int)), - this, SLOT (runAllTests()) ); - connect ( model, SIGNAL (dataChanged(QModelIndex,QModelIndex)), - this, SLOT (runAllTests()) ); - connect ( model, SIGNAL (headerDataChanged(Qt::Orientation,int,int)), - this, SLOT (runAllTests()) ); - connect ( model, SIGNAL (layoutAboutToBeChanged()), this, SLOT (runAllTests()) ); - connect ( model, SIGNAL (layoutChanged()), this, SLOT (runAllTests()) ); - connect ( model, SIGNAL (modelReset()), this, SLOT (runAllTests()) ); - connect ( model, SIGNAL (rowsAboutToBeInserted(QModelIndex,int,int)), - this, SLOT (runAllTests()) ); - connect ( model, SIGNAL (rowsAboutToBeRemoved(QModelIndex,int,int)), - this, SLOT (runAllTests()) ); - connect ( model, SIGNAL (rowsInserted(QModelIndex,int,int)), - this, SLOT (runAllTests()) ); - connect ( model, SIGNAL (rowsRemoved(QModelIndex,int,int)), - this, SLOT (runAllTests()) ); - - // Special checks for inserting/removing - connect ( model, SIGNAL (layoutAboutToBeChanged()), - this, SLOT (layoutAboutToBeChanged()) ); - connect ( model, SIGNAL (layoutChanged()), - this, SLOT (layoutChanged()) ); - - connect ( model, SIGNAL (rowsAboutToBeInserted(QModelIndex,int,int)), - this, SLOT (rowsAboutToBeInserted(QModelIndex,int,int)) ); - connect ( model, SIGNAL (rowsAboutToBeRemoved(QModelIndex,int,int)), - this, SLOT (rowsAboutToBeRemoved(QModelIndex,int,int)) ); - connect ( model, SIGNAL (rowsInserted(QModelIndex,int,int)), - this, SLOT (rowsInserted(QModelIndex,int,int)) ); - connect ( model, SIGNAL (rowsRemoved(QModelIndex,int,int)), - this, SLOT (rowsRemoved(QModelIndex,int,int)) ); - - runAllTests(); -} - -void ModelTest::runAllTests() -{ - if ( fetchingMore ) - return; - nonDestructiveBasicTest(); - rowCount(); - columnCount(); - hasIndex(); - index(); - parent(); - data(); -} - -/*! - nonDestructiveBasicTest tries to call a number of the basic functions (not all) - to make sure the model doesn't outright segfault, testing the functions that makes sense. -*/ -void ModelTest::nonDestructiveBasicTest() -{ - Q_ASSERT ( model->buddy ( QModelIndex() ) == QModelIndex() ); - model->canFetchMore ( QModelIndex() ); - Q_ASSERT ( model->columnCount ( QModelIndex() ) >= 0 ); - Q_ASSERT ( model->data ( QModelIndex() ) == QVariant() ); - fetchingMore = true; - model->fetchMore ( QModelIndex() ); - fetchingMore = false; - Qt::ItemFlags flags = model->flags ( QModelIndex() ); - Q_ASSERT ( flags == Qt::ItemIsDropEnabled || flags == 0 ); - model->hasChildren ( QModelIndex() ); - model->hasIndex ( 0, 0 ); - model->headerData ( 0, Qt::Horizontal ); - model->index ( 0, 0 ); - model->itemData ( QModelIndex() ); - QVariant cache; - model->match ( QModelIndex(), -1, cache ); - model->mimeTypes(); - Q_ASSERT ( model->parent ( QModelIndex() ) == QModelIndex() ); - Q_ASSERT ( model->rowCount() >= 0 ); - QVariant variant; - model->setData ( QModelIndex(), variant, -1 ); - model->setHeaderData ( -1, Qt::Horizontal, QVariant() ); - model->setHeaderData ( 999999, Qt::Horizontal, QVariant() ); - QMap<int, QVariant> roles; - model->sibling ( 0, 0, QModelIndex() ); - model->span ( QModelIndex() ); - model->supportedDropActions(); -} - -/*! - Tests model's implementation of QAbstractItemModel::rowCount() and hasChildren() - - Models that are dynamically populated are not as fully tested here. - */ -void ModelTest::rowCount() -{ -// qDebug() << "rc"; - // check top row - QModelIndex topIndex = model->index ( 0, 0, QModelIndex() ); - int rows = model->rowCount ( topIndex ); - Q_ASSERT ( rows >= 0 ); - if ( rows > 0 ) - Q_ASSERT ( model->hasChildren ( topIndex ) == true ); - - QModelIndex secondLevelIndex = model->index ( 0, 0, topIndex ); - if ( secondLevelIndex.isValid() ) { // not the top level - // check a row count where parent is valid - rows = model->rowCount ( secondLevelIndex ); - Q_ASSERT ( rows >= 0 ); - if ( rows > 0 ) - Q_ASSERT ( model->hasChildren ( secondLevelIndex ) == true ); - } - - // The models rowCount() is tested more extensively in checkChildren(), - // but this catches the big mistakes -} - -/*! - Tests model's implementation of QAbstractItemModel::columnCount() and hasChildren() - */ -void ModelTest::columnCount() -{ - // check top row - QModelIndex topIndex = model->index ( 0, 0, QModelIndex() ); - Q_ASSERT ( model->columnCount ( topIndex ) >= 0 ); - - // check a column count where parent is valid - QModelIndex childIndex = model->index ( 0, 0, topIndex ); - if ( childIndex.isValid() ) - Q_ASSERT ( model->columnCount ( childIndex ) >= 0 ); - - // columnCount() is tested more extensively in checkChildren(), - // but this catches the big mistakes -} - -/*! - Tests model's implementation of QAbstractItemModel::hasIndex() - */ -void ModelTest::hasIndex() -{ -// qDebug() << "hi"; - // Make sure that invalid values returns an invalid index - Q_ASSERT ( model->hasIndex ( -2, -2 ) == false ); - Q_ASSERT ( model->hasIndex ( -2, 0 ) == false ); - Q_ASSERT ( model->hasIndex ( 0, -2 ) == false ); - - int rows = model->rowCount(); - int columns = model->columnCount(); - - // check out of bounds - Q_ASSERT ( model->hasIndex ( rows, columns ) == false ); - Q_ASSERT ( model->hasIndex ( rows + 1, columns + 1 ) == false ); - - if ( rows > 0 ) - Q_ASSERT ( model->hasIndex ( 0, 0 ) == true ); - - // hasIndex() is tested more extensively in checkChildren(), - // but this catches the big mistakes -} - -/*! - Tests model's implementation of QAbstractItemModel::index() - */ -void ModelTest::index() -{ -// qDebug() << "i"; - // Make sure that invalid values returns an invalid index - Q_ASSERT ( model->index ( -2, -2 ) == QModelIndex() ); - Q_ASSERT ( model->index ( -2, 0 ) == QModelIndex() ); - Q_ASSERT ( model->index ( 0, -2 ) == QModelIndex() ); - - int rows = model->rowCount(); - int columns = model->columnCount(); - - if ( rows == 0 ) - return; - - // Catch off by one errors - Q_ASSERT ( model->index ( rows, columns ) == QModelIndex() ); - Q_ASSERT ( model->index ( 0, 0 ).isValid() == true ); - - // Make sure that the same index is *always* returned - QModelIndex a = model->index ( 0, 0 ); - QModelIndex b = model->index ( 0, 0 ); - Q_ASSERT ( a == b ); - - // index() is tested more extensively in checkChildren(), - // but this catches the big mistakes -} - -/*! - Tests model's implementation of QAbstractItemModel::parent() - */ -void ModelTest::parent() -{ -// qDebug() << "p"; - // Make sure the model wont crash and will return an invalid QModelIndex - // when asked for the parent of an invalid index. - Q_ASSERT ( model->parent ( QModelIndex() ) == QModelIndex() ); - - if ( model->rowCount() == 0 ) - return; - - // Column 0 | Column 1 | - // QModelIndex() | | - // \- topIndex | topIndex1 | - // \- childIndex | childIndex1 | - - // Common error test #1, make sure that a top level index has a parent - // that is a invalid QModelIndex. - QModelIndex topIndex = model->index ( 0, 0, QModelIndex() ); - Q_ASSERT ( model->parent ( topIndex ) == QModelIndex() ); - - // Common error test #2, make sure that a second level index has a parent - // that is the first level index. - if ( model->rowCount ( topIndex ) > 0 ) { - QModelIndex childIndex = model->index ( 0, 0, topIndex ); - Q_ASSERT ( model->parent ( childIndex ) == topIndex ); - } - - // Common error test #3, the second column should NOT have the same children - // as the first column in a row. - // Usually the second column shouldn't have children. - QModelIndex topIndex1 = model->index ( 0, 1, QModelIndex() ); - if ( model->rowCount ( topIndex1 ) > 0 ) { - QModelIndex childIndex = model->index ( 0, 0, topIndex ); - QModelIndex childIndex1 = model->index ( 0, 0, topIndex1 ); - Q_ASSERT ( childIndex != childIndex1 ); - } - - // Full test, walk n levels deep through the model making sure that all - // parent's children correctly specify their parent. - checkChildren ( QModelIndex() ); -} - -/*! - Called from the parent() test. - - A model that returns an index of parent X should also return X when asking - for the parent of the index. - - This recursive function does pretty extensive testing on the whole model in an - effort to catch edge cases. - - This function assumes that rowCount(), columnCount() and index() already work. - If they have a bug it will point it out, but the above tests should have already - found the basic bugs because it is easier to figure out the problem in - those tests then this one. - */ -void ModelTest::checkChildren ( const QModelIndex &parent, int currentDepth ) -{ - // First just try walking back up the tree. - QModelIndex p = parent; - while ( p.isValid() ) - p = p.parent(); - - // For models that are dynamically populated - if ( model->canFetchMore ( parent ) ) { - fetchingMore = true; - model->fetchMore ( parent ); - fetchingMore = false; - } - - int rows = model->rowCount ( parent ); - int columns = model->columnCount ( parent ); - - if ( rows > 0 ) - Q_ASSERT ( model->hasChildren ( parent ) ); - - // Some further testing against rows(), columns(), and hasChildren() - Q_ASSERT ( rows >= 0 ); - Q_ASSERT ( columns >= 0 ); - if ( rows > 0 ) - Q_ASSERT ( model->hasChildren ( parent ) == true ); - - //qDebug() << "parent:" << model->data(parent).toString() << "rows:" << rows - // << "columns:" << columns << "parent column:" << parent.column(); - - Q_ASSERT ( model->hasIndex ( rows + 1, 0, parent ) == false ); - for ( int r = 0; r < rows; ++r ) { - if ( model->canFetchMore ( parent ) ) { - fetchingMore = true; - model->fetchMore ( parent ); - fetchingMore = false; - } - Q_ASSERT ( model->hasIndex ( r, columns + 1, parent ) == false ); - for ( int c = 0; c < columns; ++c ) { - Q_ASSERT ( model->hasIndex ( r, c, parent ) == true ); - QModelIndex index = model->index ( r, c, parent ); - // rowCount() and columnCount() said that it existed... - Q_ASSERT ( index.isValid() == true ); - - // index() should always return the same index when called twice in a row - QModelIndex modifiedIndex = model->index ( r, c, parent ); - Q_ASSERT ( index == modifiedIndex ); - - // Make sure we get the same index if we request it twice in a row - QModelIndex a = model->index ( r, c, parent ); - QModelIndex b = model->index ( r, c, parent ); - Q_ASSERT ( a == b ); - - // Some basic checking on the index that is returned - Q_ASSERT ( index.model() == model ); - Q_ASSERT ( index.row() == r ); - Q_ASSERT ( index.column() == c ); - // While you can technically return a QVariant usually this is a sign - // of an bug in data() Disable if this really is ok in your model. -// Q_ASSERT ( model->data ( index, Qt::DisplayRole ).isValid() == true ); - - // If the next test fails here is some somewhat useful debug you play with. - - if (model->parent(index) != parent) { - qDebug() << r << c << currentDepth << model->data(index).toString() - << model->data(parent).toString(); - qDebug() << index << parent << model->parent(index); -// And a view that you can even use to show the model. -// QTreeView view; -// view.setModel(model); -// view.show(); - } - - // Check that we can get back our real parent. -// qDebug() << model->parent ( index ) << parent ; - Q_ASSERT ( model->parent ( index ) == parent ); - - // recursively go down the children - if ( model->hasChildren ( index ) && currentDepth < 10 ) { - //qDebug() << r << c << "has children" << model->rowCount(index); - checkChildren ( index, ++currentDepth ); - }/* else { if (currentDepth >= 10) qDebug() << "checked 10 deep"; };*/ - - // make sure that after testing the children that the index doesn't change. - QModelIndex newerIndex = model->index ( r, c, parent ); - Q_ASSERT ( index == newerIndex ); - } - } -} - -/*! - Tests model's implementation of QAbstractItemModel::data() - */ -void ModelTest::data() -{ - // Invalid index should return an invalid qvariant - Q_ASSERT ( !model->data ( QModelIndex() ).isValid() ); - - if ( model->rowCount() == 0 ) - return; - - // A valid index should have a valid QVariant data - Q_ASSERT ( model->index ( 0, 0 ).isValid() ); - - // shouldn't be able to set data on an invalid index - Q_ASSERT ( model->setData ( QModelIndex(), QLatin1String ( "foo" ), Qt::DisplayRole ) == false ); - - // General Purpose roles that should return a QString - QVariant variant = model->data ( model->index ( 0, 0 ), Qt::ToolTipRole ); - if ( variant.isValid() ) { - Q_ASSERT ( qVariantCanConvert<QString> ( variant ) ); - } - variant = model->data ( model->index ( 0, 0 ), Qt::StatusTipRole ); - if ( variant.isValid() ) { - Q_ASSERT ( qVariantCanConvert<QString> ( variant ) ); - } - variant = model->data ( model->index ( 0, 0 ), Qt::WhatsThisRole ); - if ( variant.isValid() ) { - Q_ASSERT ( qVariantCanConvert<QString> ( variant ) ); - } - - // General Purpose roles that should return a QSize - variant = model->data ( model->index ( 0, 0 ), Qt::SizeHintRole ); - if ( variant.isValid() ) { - Q_ASSERT ( qVariantCanConvert<QSize> ( variant ) ); - } - - // General Purpose roles that should return a QFont - QVariant fontVariant = model->data ( model->index ( 0, 0 ), Qt::FontRole ); - if ( fontVariant.isValid() ) { - Q_ASSERT ( qVariantCanConvert<QFont> ( fontVariant ) ); - } - - // Check that the alignment is one we know about - QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ), Qt::TextAlignmentRole ); - if ( textAlignmentVariant.isValid() ) { - int alignment = textAlignmentVariant.toInt(); - Q_ASSERT ( alignment == ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) ); - } - - // General Purpose roles that should return a QColor - QVariant colorVariant = model->data ( model->index ( 0, 0 ), Qt::BackgroundColorRole ); - if ( colorVariant.isValid() ) { - Q_ASSERT ( qVariantCanConvert<QColor> ( colorVariant ) ); - } - - colorVariant = model->data ( model->index ( 0, 0 ), Qt::TextColorRole ); - if ( colorVariant.isValid() ) { - Q_ASSERT ( qVariantCanConvert<QColor> ( colorVariant ) ); - } - - // Check that the "check state" is one we know about. - QVariant checkStateVariant = model->data ( model->index ( 0, 0 ), Qt::CheckStateRole ); - if ( checkStateVariant.isValid() ) { - int state = checkStateVariant.toInt(); - Q_ASSERT ( state == Qt::Unchecked || - state == Qt::PartiallyChecked || - state == Qt::Checked ); - } -} - -/*! - Store what is about to be inserted to make sure it actually happens - - \sa rowsInserted() - */ -void ModelTest::rowsAboutToBeInserted ( const QModelIndex &parent, int start, int end ) -{ - Q_UNUSED(end); -// qDebug() << "rowsAboutToBeInserted" << "start=" << start << "end=" << end << "parent=" << model->data ( parent ).toString() -// << "current count of parent=" << model->rowCount ( parent ); // << "display of last=" << model->data( model->index(start-1, 0, parent) ); -// qDebug() << model->index(start-1, 0, parent) << model->data( model->index(start-1, 0, parent) ); - Changing c; - c.parent = parent; - c.oldSize = model->rowCount ( parent ); - c.last = model->data ( model->index ( start - 1, 0, parent ) ); - c.next = model->data ( model->index ( start, 0, parent ) ); - insert.push ( c ); -} - -/*! - Confirm that what was said was going to happen actually did - - \sa rowsAboutToBeInserted() - */ -void ModelTest::rowsInserted ( const QModelIndex & parent, int start, int end ) -{ - Changing c = insert.pop(); - Q_ASSERT ( c.parent == parent ); -// qDebug() << "rowsInserted" << "start=" << start << "end=" << end << "oldsize=" << c.oldSize -// << "parent=" << model->data ( parent ).toString() << "current rowcount of parent=" << model->rowCount ( parent ); - -// for (int ii=start; ii <= end; ii++) -// { -// qDebug() << "itemWasInserted:" << ii << model->data ( model->index ( ii, 0, parent )); -// } -// qDebug(); - - Q_ASSERT ( c.oldSize + ( end - start + 1 ) == model->rowCount ( parent ) ); - Q_ASSERT ( c.last == model->data ( model->index ( start - 1, 0, c.parent ) ) ); - - if (c.next != model->data(model->index(end + 1, 0, c.parent))) { - qDebug() << start << end; - for (int i=0; i < model->rowCount(); ++i) - qDebug() << model->index(i, 0).data().toString(); - qDebug() << c.next << model->data(model->index(end + 1, 0, c.parent)); - } - - Q_ASSERT ( c.next == model->data ( model->index ( end + 1, 0, c.parent ) ) ); -} - -void ModelTest::layoutAboutToBeChanged() -{ - for ( int i = 0; i < qBound ( 0, model->rowCount(), 100 ); ++i ) - changing.append ( QPersistentModelIndex ( model->index ( i, 0 ) ) ); -} - -void ModelTest::layoutChanged() -{ - for ( int i = 0; i < changing.count(); ++i ) { - QPersistentModelIndex p = changing[i]; - Q_ASSERT ( p == model->index ( p.row(), p.column(), p.parent() ) ); - } - changing.clear(); -} - -/*! - Store what is about to be inserted to make sure it actually happens - - \sa rowsRemoved() - */ -void ModelTest::rowsAboutToBeRemoved ( const QModelIndex &parent, int start, int end ) -{ -qDebug() << "ratbr" << parent << start << end; - Changing c; - c.parent = parent; - c.oldSize = model->rowCount ( parent ); - c.last = model->data ( model->index ( start - 1, 0, parent ) ); - c.next = model->data ( model->index ( end + 1, 0, parent ) ); - remove.push ( c ); -} - -/*! - Confirm that what was said was going to happen actually did - - \sa rowsAboutToBeRemoved() - */ -void ModelTest::rowsRemoved ( const QModelIndex & parent, int start, int end ) -{ - qDebug() << "rr" << parent << start << end; - Changing c = remove.pop(); - Q_ASSERT ( c.parent == parent ); - Q_ASSERT ( c.oldSize - ( end - start + 1 ) == model->rowCount ( parent ) ); - Q_ASSERT ( c.last == model->data ( model->index ( start - 1, 0, c.parent ) ) ); - Q_ASSERT ( c.next == model->data ( model->index ( start, 0, c.parent ) ) ); -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.62.0/autotests/modeltest.h new/kdeclarative-5.63.0/autotests/modeltest.h --- old/kdeclarative-5.62.0/autotests/modeltest.h 2019-09-07 15:57:15.000000000 +0200 +++ new/kdeclarative-5.63.0/autotests/modeltest.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,94 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation ([email protected]) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at [email protected]. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#ifndef MODELTEST_H -#define MODELTEST_H - -#include <QObject> -#include <QAbstractItemModel> -#include <QStack> - -class ModelTest : public QObject -{ - Q_OBJECT - -public: - explicit ModelTest( QAbstractItemModel *model, QObject *parent = nullptr ); - -private Q_SLOTS: - void nonDestructiveBasicTest(); - void rowCount(); - void columnCount(); - void hasIndex(); - void index(); - void parent(); - void data(); - -protected Q_SLOTS: - void runAllTests(); - void layoutAboutToBeChanged(); - void layoutChanged(); - void rowsAboutToBeInserted( const QModelIndex &parent, int start, int end ); - void rowsInserted( const QModelIndex & parent, int start, int end ); - void rowsAboutToBeRemoved( const QModelIndex &parent, int start, int end ); - void rowsRemoved( const QModelIndex & parent, int start, int end ); - -private: - void checkChildren( const QModelIndex &parent, int currentDepth = 0 ); - - QAbstractItemModel *model; - - struct Changing { - QModelIndex parent; - int oldSize; - QVariant last; - QVariant next; - }; - QStack<Changing> insert; - QStack<Changing> remove; - - bool fetchingMore; - - QList<QPersistentModelIndex> changing; -}; - -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.62.0/po/lt/kdeclarative5.po new/kdeclarative-5.63.0/po/lt/kdeclarative5.po --- old/kdeclarative-5.62.0/po/lt/kdeclarative5.po 2019-09-07 15:57:15.000000000 +0200 +++ new/kdeclarative-5.63.0/po/lt/kdeclarative5.po 2019-10-06 11:44:03.000000000 +0200 @@ -13,8 +13,8 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-08-09 02:54+0200\n" -"PO-Revision-Date: 2015-12-30 18:08+0200\n" -"Last-Translator: Mindaugas Baranauskas <[email protected]>\n" +"PO-Revision-Date: 2019-09-08 17:58+0300\n" +"Last-Translator: Moo\n" "Language-Team: lt <[email protected]>\n" "Language: lt\n" "MIME-Version: 1.0\n" @@ -22,27 +22,27 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n" "%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Poedit 2.2.1\n" #, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "" +msgstr "Moo" #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "" +msgstr "<>" #: kpackagelauncherqml/main.cpp:43 #, kde-format msgid "KPackage QML application shell" -msgstr "" +msgstr "KPackage QML programos apvalkalas" #: kpackagelauncherqml/main.cpp:50 #, kde-format msgid "The unique name of the application (mandatory)" -msgstr "" +msgstr "Unikalus programos pavadinimas (privalomas)" #: qmlcontrols/kquickcontrols/KeySequenceItem.qml:38 #, kde-format @@ -50,14 +50,14 @@ "Click on the button, then enter the shortcut like you would in the program.\n" "Example for Ctrl+A: hold the Ctrl key and press A." msgstr "" -"Spauskite mygtuką, tada įveskite klavišų derinį taip, tarsi būtumėte " -"programoje.\n" -"Pavyzdžiui kombinacijai Vald+A: laikykite Vald ir spauskite A." +"Spustelėkite ant mygtuko, tada įveskite klavišų kombinaciją taip, tarsi " +"būtumėte programoje.\n" +"Pavyzdžiui kombinacijai Vald+A: laikykite Vald klavišą ir paspauskite A." #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:273 #, kde-format msgid "Reserved Shortcut" -msgstr "Rezervuotas klavišų derinys" +msgstr "Rezervuota klavišų kombinacija" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:274 #, kde-format @@ -67,13 +67,13 @@ "Please choose another one." msgstr "" "F12 klavišas yra rezervuotas Windows sistemoje, taigi negali būti naudojamas " -"trumpuoju klavišų deriniu.\n" +"visuotine klavišų kombinacija.\n" "Prašome pasirinkti kitą." #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:330 #, kde-format msgid "Conflict with Standard Application Shortcut" -msgstr "Konfliktas su standartiniu programos iššaukimo klavišų deriniu" +msgstr "Konfliktas su standartine programos klavišų kombinacija" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:331 #, kde-format @@ -82,9 +82,9 @@ "some applications use.\n" "Do you really want to use it as a global shortcut as well?" msgstr "" -"Klavišų derinys „%1“ jau priskirtas standartiniam veiksmui „%2“, kurį " +"Klavišų kombinacija „%1“ jau priskirta standartiniam veiksmui „%2“, kurį " "naudoja kai kurios programos.\n" -"Ar tikrai norite jį naudoti ir kaip globalųjį spartųjį klavišų derinį?" +"Ar tikrai norite ją naudoti ir kaip visuotinę sparčiųjų klavišų kombinaciją?" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:336 #, kde-format @@ -101,12 +101,12 @@ #, kde-format msgctxt "No shortcut defined" msgid "None" -msgstr "Jokio" +msgstr "Nėra" #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:406 #, kde-format msgid "The key you just pressed is not supported by Qt." -msgstr "Klavišas, kurį nuspaudėte, nepalaikomas Qt sistemoje." +msgstr "Klavišas, kurį ką tik paspaudėte, nepalaikomas Qt sistemoje." #: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:407 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.62.0/po/se/kdeclarative5.po new/kdeclarative-5.63.0/po/se/kdeclarative5.po --- old/kdeclarative-5.62.0/po/se/kdeclarative5.po 2019-09-07 15:57:15.000000000 +0200 +++ new/kdeclarative-5.63.0/po/se/kdeclarative5.po 2019-10-06 11:44:03.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-06-15 02:52+0200\n" +"POT-Creation-Date: 2019-08-09 02:54+0200\n" "PO-Revision-Date: 2012-05-30 23:19+0200\n" "Last-Translator: Børre Gaup <[email protected]>\n" "Language-Team: Northern Sami <[email protected]>\n" @@ -49,12 +49,12 @@ "prográmmas.\n" "Ovdamearka dihte Ctrl+a: Doala Ctrl-boalu ja deaddil a." -#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:275 +#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:273 #, kde-format msgid "Reserved Shortcut" msgstr "Várrejuvvon njuolggobálggis" -#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:276 +#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:274 #, kde-format msgid "" "The F12 key is reserved on Windows, so cannot be used for a global " @@ -65,12 +65,12 @@ "geavahit globálalaš njuolggobálggisin.\n" "Válljes eará njuolggobálgá." -#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:332 +#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:330 #, kde-format msgid "Conflict with Standard Application Shortcut" msgstr "Konflikta standardprográmma njuolggobálgáin" -#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:333 +#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:331 #, kde-format msgid "" "The '%1' key combination is also used for the standard action \"%2\" that " @@ -81,30 +81,30 @@ "prográmma geavahit dan juo.\n" "Háliidatgo duođas geavahit dán globála njuolggobálggisin?" -#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:338 +#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:336 #, kde-format msgid "Reassign" msgstr "Bija ođđasit" -#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:380 +#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:378 #, kde-format msgctxt "What the user inputs now will be taken as the new shortcut" msgid "Input" msgstr "Mearrit njuolggobálgá" # unreviewed-context -#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:387 +#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:385 #, kde-format msgctxt "No shortcut defined" msgid "None" msgstr "Ii mihkkige" -#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:408 +#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:406 #, kde-format msgid "The key you just pressed is not supported by Qt." msgstr "Qt ii doarjjo boalu maid easka deaddilit." -#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:409 +#: qmlcontrols/kquickcontrols/private/keysequencehelper.cpp:407 #, kde-format msgid "Unsupported Key" msgstr "Doarjjokeahtes boallu" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.62.0/src/kdeclarative/qmlobjectsharedengine.cpp new/kdeclarative-5.63.0/src/kdeclarative/qmlobjectsharedengine.cpp --- old/kdeclarative-5.62.0/src/kdeclarative/qmlobjectsharedengine.cpp 2019-09-07 15:57:15.000000000 +0200 +++ new/kdeclarative-5.63.0/src/kdeclarative/qmlobjectsharedengine.cpp 2019-10-06 11:44:03.000000000 +0200 @@ -68,11 +68,11 @@ : QmlObject(QmlObjectSharedEnginePrivate::engine(), new QQmlContext(QmlObjectSharedEnginePrivate::engine()), this /*don't call setupEngine*/, parent), d(new QmlObjectSharedEnginePrivate()) { + rootContext()->setParent(this); } QmlObjectSharedEngine::~QmlObjectSharedEngine() { - rootContext()->deleteLater(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.62.0/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.cpp new/kdeclarative-5.63.0/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.cpp --- old/kdeclarative-5.62.0/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.cpp 2019-09-07 15:57:15.000000000 +0200 +++ new/kdeclarative-5.63.0/src/qmlcontrols/kquickcontrolsaddons/eventgenerator.cpp 2019-10-06 11:44:03.000000000 +0200 @@ -78,7 +78,11 @@ QPointF pos(x, y); QPointF globalPos(item->window()->mapToGlobal(item->mapToScene(pos).toPoint())); +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) QWheelEvent ev(pos, globalPos, pixelDelta, angleDelta, /* qt4Delta */ 0, /* qt4Orientation */ Qt::Horizontal, buttons, modifiers); +#else + QWheelEvent ev(pos, globalPos, pixelDelta, angleDelta, buttons, modifiers, Qt::ScrollUpdate, false /*not inverted*/); +#endif QGuiApplication::sendEvent(item, &ev); } @@ -101,19 +105,13 @@ return; } - QQuickWindow *win = item->window(); - - if (!win) { - return; - } - switch (type) { case GrabMouse: item->grabMouse(); break; case UngrabMouse: { QEvent ev(QEvent::UngrabMouse); - win->sendEvent(item, &ev); + QGuiApplication::sendEvent(item, &ev); return; } default: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.62.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp new/kdeclarative-5.63.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp --- old/kdeclarative-5.62.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp 2019-09-07 15:57:15.000000000 +0200 +++ new/kdeclarative-5.63.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp 2019-10-06 11:44:03.000000000 +0200 @@ -226,7 +226,11 @@ return; } - KDeclarativeWheelEvent dwe(we->pos(), we->globalPos(), we->delta(), we->buttons(), we->modifiers(), we->orientation()); +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + KDeclarativeWheelEvent dwe(we->pos(), we->globalPos(), we->angleDelta(), we->buttons(), we->modifiers(), we->orientation()); +#else + KDeclarativeWheelEvent dwe(we->position().toPoint(), we->globalPosition().toPoint(), we->angleDelta(), we->buttons(), we->modifiers(), Qt::Vertical /* HACK, deprecated, remove */); +#endif emit wheelMoved(&dwe); } @@ -361,7 +365,11 @@ case QEvent::Wheel: { m_lastEvent = event; QWheelEvent *we = static_cast<QWheelEvent *>(event); - KDeclarativeWheelEvent dwe(we->pos(), we->globalPos(), we->delta(), we->buttons(), we->modifiers(), we->orientation()); +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + KDeclarativeWheelEvent dwe(we->pos(), we->globalPos(), we->angleDelta(), we->buttons(), we->modifiers(), we->orientation()); +#else + KDeclarativeWheelEvent dwe(we->position().toPoint(), we->globalPosition().toPoint(), we->angleDelta(), we->buttons(), we->modifiers(), Qt::Vertical /* HACK, deprecated, remove */); +#endif emit wheelMoved(&dwe); break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.62.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h new/kdeclarative-5.63.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h --- old/kdeclarative-5.62.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h 2019-09-07 15:57:15.000000000 +0200 +++ new/kdeclarative-5.63.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h 2019-10-06 11:44:03.000000000 +0200 @@ -104,13 +104,15 @@ Q_PROPERTY(int y READ y CONSTANT) Q_PROPERTY(int screenX READ screenX CONSTANT) Q_PROPERTY(int screenY READ screenY CONSTANT) - Q_PROPERTY(int delta READ delta CONSTANT) + Q_PROPERTY(int deltaX READ deltaX CONSTANT) + Q_PROPERTY(int deltaY READ deltaY CONSTANT) + Q_PROPERTY(int delta READ deltaY CONSTANT) // deprecated in favor of deltaY. TODO KF6: remove Q_PROPERTY(Qt::MouseButtons buttons READ buttons CONSTANT) Q_PROPERTY(Qt::KeyboardModifiers modifiers READ modifiers CONSTANT) - Q_PROPERTY(Qt::Orientation orientation READ orientation CONSTANT) + Q_PROPERTY(Qt::Orientation orientation READ orientation CONSTANT) // deprecated. TODO KF6: remove public: - KDeclarativeWheelEvent(QPointF pos, QPoint screenPos, int delta, + KDeclarativeWheelEvent(QPointF pos, QPoint screenPos, QPoint angleDelta, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Qt::Orientation orientation) @@ -118,7 +120,7 @@ m_y(pos.y()), m_screenX(screenPos.x()), m_screenY(screenPos.y()), - m_delta(delta), + m_angleDelta(angleDelta), m_buttons(buttons), m_modifiers(modifiers), m_orientation(orientation) @@ -128,10 +130,11 @@ int y() const { return m_y; } int screenX() const { return m_screenX; } int screenY() const { return m_screenY; } - int delta() const { return m_delta; } + int deltaX() const { return m_angleDelta.x(); } + int deltaY() const { return m_angleDelta.y(); } Qt::MouseButtons buttons() const { return m_buttons; } Qt::KeyboardModifiers modifiers() const { return m_modifiers; } - Qt::Orientation orientation() { return m_orientation; } + Qt::Orientation orientation() { return m_orientation; } // TODO KF6: remove // only for internal usage void setX(int x) { m_x = x; } @@ -142,7 +145,7 @@ int m_y; int m_screenX; int m_screenY; - int m_delta; + QPoint m_angleDelta; Qt::MouseButtons m_buttons; Qt::KeyboardModifiers m_modifiers; Qt::Orientation m_orientation;
