Hello community, here is the log from the commit of package kitemmodels for openSUSE:Factory checked in at 2016-05-19 12:08:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitemmodels (Old) and /work/SRC/openSUSE:Factory/.kitemmodels.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitemmodels" Changes: -------- --- /work/SRC/openSUSE:Factory/kitemmodels/kitemmodels.changes 2016-04-12 19:20:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kitemmodels.new/kitemmodels.changes 2016-05-19 12:08:14.000000000 +0200 @@ -1,0 +2,9 @@ +Sat May 7 18:32:28 UTC 2016 - hrvoje.sen...@gmail.com + +- Update to 5.22.0 (boo#980066) + * Fix template syntax for test case generation + * Fix linking with Qt 5.4 (wrongly placed #endif) + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.22.0.php + +------------------------------------------------------------------- Old: ---- kitemmodels-5.21.0.tar.xz New: ---- kitemmodels-5.22.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitemmodels.spec ++++++ --- /var/tmp/diff_new_pack.L5GpX4/_old 2016-05-19 12:08:14.000000000 +0200 +++ /var/tmp/diff_new_pack.L5GpX4/_new 2016-05-19 12:08:14.000000000 +0200 @@ -17,9 +17,9 @@ %define lname libKF5ItemModels5 -%define _tar_path 5.21 +%define _tar_path 5.22 Name: kitemmodels -Version: 5.21.0 +Version: 5.22.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_tar_path} ++++++ kitemmodels-5.21.0.tar.xz -> kitemmodels-5.22.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.21.0/CMakeLists.txt new/kitemmodels-5.22.0/CMakeLists.txt --- old/kitemmodels-5.21.0/CMakeLists.txt 2016-04-03 22:34:03.000000000 +0200 +++ new/kitemmodels-5.22.0/CMakeLists.txt 2016-05-06 21:38:43.000000000 +0200 @@ -3,7 +3,7 @@ project(KItemModels) include(FeatureSummary) -find_package(ECM 5.21.0 NO_MODULE) +find_package(ECM 5.22.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) @@ -23,7 +23,7 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "5.21.0") # handled by release scripts +set(KF5_VERSION "5.22.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KITEMMODELS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kitemmodels_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.21.0/autotests/kselectionproxymodeltest.cpp new/kitemmodels-5.22.0/autotests/kselectionproxymodeltest.cpp --- old/kitemmodels-5.21.0/autotests/kselectionproxymodeltest.cpp 2016-04-03 22:34:03.000000000 +0200 +++ new/kitemmodels-5.22.0/autotests/kselectionproxymodeltest.cpp 2016-05-06 21:38:43.000000000 +0200 @@ -382,6 +382,8 @@ QCOMPARE(proxy.rowCount(), expectedRowCountAfter); } +#endif + void KSelectionProxyModelTest::removeRows_data() { QTest::addColumn<int>("kspm_mode"); @@ -840,7 +842,11 @@ ); resetCommand.doCommand(); +#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) QItemSelectionModel selectionModel; +#else + QItemSelectionModel selectionModel(&tree); +#endif if (emulateSingleSelectionMode) { @@ -860,13 +866,19 @@ proxy.setFilterBehavior(static_cast<KSelectionProxyModel::FilterBehavior>(kspm_mode)); if (connectSelectionModelFirst) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) selectionModel.setModel(&tree); +#endif proxy.setSourceModel(&tree); proxy.setSelectionModel(&selectionModel); } else { proxy.setSourceModel(&tree); proxy.setSelectionModel(&selectionModel); +#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) selectionModel.setModel(&tree); +#else + QSKIP("No QItemSelectionModel::setModel in Qt 5.4", SkipSingle); +#endif } QSignalSpy beforeSpy(&proxy, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int))); @@ -906,8 +918,6 @@ QCOMPARE(proxy.rowCount(), expectedRowCountAfter); } -#endif - void KSelectionProxyModelTest::selectionMapping() { QStringListModel strings(days); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.21.0/autotests/proxymodeltestsuite/templates/datachanged.cpp new/kitemmodels-5.22.0/autotests/proxymodeltestsuite/templates/datachanged.cpp --- old/kitemmodels-5.21.0/autotests/proxymodeltestsuite/templates/datachanged.cpp 2016-04-03 22:34:03.000000000 +0200 +++ new/kitemmodels-5.22.0/autotests/proxymodeltestsuite/templates/datachanged.cpp 2016-05-06 21:38:43.000000000 +0200 @@ -1,8 +1,8 @@ -{ + { ModelDataChangeCommand dataChangeCommand(&rootModel); dataChangeCommand.setAncestorRowNumbers({{ event.rowAncestors }}); dataChangeCommand.setStartRow({{ event.start }}); dataChangeCommand.setEndRow({{ event.end }}); dataChangeCommand.doCommand(); -} + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.21.0/autotests/proxymodeltestsuite/templates/init.cpp new/kitemmodels-5.22.0/autotests/proxymodeltestsuite/templates/init.cpp --- old/kitemmodels-5.21.0/autotests/proxymodeltestsuite/templates/init.cpp 2016-04-03 22:34:03.000000000 +0200 +++ new/kitemmodels-5.22.0/autotests/proxymodeltestsuite/templates/init.cpp 2016-05-06 21:38:43.000000000 +0200 @@ -1,10 +1,11 @@ -{ % if event.interpretString % } { -ModelInsertCommand insertCommand(&rootModel); +{% if event.interpretString %} + { + ModelInsertCommand insertCommand(&rootModel); insertCommand.setStartRow(0); insertCommand.interpret( - {{ event.interpretString }} +{{ event.interpretString }} ); insertCommand.doCommand(); -} -{ % endif % } + } +{% endif %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.21.0/autotests/proxymodeltestsuite/templates/layoutchanged.cpp new/kitemmodels-5.22.0/autotests/proxymodeltestsuite/templates/layoutchanged.cpp --- old/kitemmodels-5.21.0/autotests/proxymodeltestsuite/templates/layoutchanged.cpp 2016-04-03 22:34:03.000000000 +0200 +++ new/kitemmodels-5.22.0/autotests/proxymodeltestsuite/templates/layoutchanged.cpp 2016-05-06 21:38:43.000000000 +0200 @@ -1,18 +1,18 @@ -{ + { ModelLayoutChangeCommand layoutChangeCommand(&rootModel); layoutChangeCommand.setInitialTree( - {{ event.interpretString }} +{{ event.interpretString }} ); QList<ModelLayoutChangeCommand::PersistentChange> changes; - { % for change in event.changes % } -{ - ModelLayoutChangeCommand::PersistentChange change; - change.oldPath = {{ change.oldPath }}; - change.newPath = {{ change.newPath }}; - changes.append(change); + {% for change in event.changes %} + { + ModelLayoutChangeCommand::PersistentChange change; + change.oldPath = {{ change.oldPath }}; + change.newPath = {{ change.newPath }}; + changes.append(change); } - { % endfor % } + {% endfor %} layoutChangeCommand.setPersistentChanges(changes); layoutChangeCommand.doCommand(); -} + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.21.0/autotests/proxymodeltestsuite/templates/main.cpp new/kitemmodels-5.22.0/autotests/proxymodeltestsuite/templates/main.cpp --- old/kitemmodels-5.21.0/autotests/proxymodeltestsuite/templates/main.cpp 2016-04-03 22:34:03.000000000 +0200 +++ new/kitemmodels-5.22.0/autotests/proxymodeltestsuite/templates/main.cpp 2016-05-06 21:38:43.000000000 +0200 @@ -2,42 +2,27 @@ #include <QApplication> #include <dynamictreemodel.h> -int main(int argc, char **argv) +int main (int argc, char **argv) { - QApplication app(argc, argv); + QApplication app(argc, argv); - DynamicTreeModel rootModel; - { - % if initEvent % - } { - % with initEvent as event % -} -// Include {{ "init.cpp" }}: {% include "init.cpp" %} -{ - % endwith % -} { - % endif % -} + DynamicTreeModel rootModel; +{% if initEvent %} {% with initEvent as event %} + // Include {{ "init.cpp" }}: {% include "init.cpp" %} +{% endwith %} {% endif %} -// Create and connect the proxy model here. -// eg: + // Create and connect the proxy model here. + // eg: -// QSortFilterProxyModel proxy; -// proxy.setDynamicSortFilter(true); -// proxy.setSourceModel(&rootModel); + // QSortFilterProxyModel proxy; + // proxy.setDynamicSortFilter(true); + // proxy.setSourceModel(&rootModel); + + // Have {{ events|length }} Events. +{% for event in events %} {% with event.type|lower|stringformat:"%1.cpp" as eventtemplate %} + // Include {{ eventtemplate }}: {% include eventtemplate %} +{% endwith %} {% endfor %} -// Have {{ events|length }} Events. -{ - % for event in events % - } { -% with event.type | lower | stringformat: "%1.cpp" as eventtemplate % -} -// Include {{ eventtemplate }}: {% include eventtemplate %} -{ - % endwith % -} { - % endfor % -} -return app.exec(); + return app.exec(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.21.0/autotests/proxymodeltestsuite/templates/modelreset.cpp new/kitemmodels-5.22.0/autotests/proxymodeltestsuite/templates/modelreset.cpp --- old/kitemmodels-5.21.0/autotests/proxymodeltestsuite/templates/modelreset.cpp 2016-04-03 22:34:03.000000000 +0200 +++ new/kitemmodels-5.22.0/autotests/proxymodeltestsuite/templates/modelreset.cpp 2016-05-06 21:38:43.000000000 +0200 @@ -1,8 +1,8 @@ -{ + { ModelResetCommand resetCommand(&rootModel); resetCommand.setInitialTree( - {{ event.interpretString }} +{{ event.interpretString }} ); resetCommand.doCommand(); -} + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.21.0/autotests/proxymodeltestsuite/templates/rowsinserted.cpp new/kitemmodels-5.22.0/autotests/proxymodeltestsuite/templates/rowsinserted.cpp --- old/kitemmodels-5.21.0/autotests/proxymodeltestsuite/templates/rowsinserted.cpp 2016-04-03 22:34:03.000000000 +0200 +++ new/kitemmodels-5.22.0/autotests/proxymodeltestsuite/templates/rowsinserted.cpp 2016-05-06 21:38:43.000000000 +0200 @@ -1,14 +1,14 @@ -{ + { ModelInsertCommand insertCommand(&rootModel); insertCommand.setAncestorRowNumbers({{ event.rowAncestors }}); insertCommand.setStartRow({{ event.start }}); - { % if event.interpretString % } -insertCommand.interpret( +{% if event.interpretString %} + insertCommand.interpret( {{ event.interpretString }} -); - { % else % } + ); +{% else %} insertCommand.setEnd({{ event.end }}); - { % endif % } +{% endif %} insertCommand.doCommand(); -} + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.21.0/autotests/proxymodeltestsuite/templates/rowsremoved.cpp new/kitemmodels-5.22.0/autotests/proxymodeltestsuite/templates/rowsremoved.cpp --- old/kitemmodels-5.21.0/autotests/proxymodeltestsuite/templates/rowsremoved.cpp 2016-04-03 22:34:03.000000000 +0200 +++ new/kitemmodels-5.22.0/autotests/proxymodeltestsuite/templates/rowsremoved.cpp 2016-05-06 21:38:43.000000000 +0200 @@ -1,8 +1,8 @@ -{ + { ModelRemoveCommand removeCommand(&rootModel); removeCommand.setAncestorRowNumbers({{ event.rowAncestors }}); removeCommand.setStartRow({{ event.start }}); removeCommand.setEndRow({{ event.end }}); removeCommand.doCommand(); -} + }
