Hello community, here is the log from the commit of package kconfigwidgets for openSUSE:Factory checked in at 2014-03-10 12:17:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kconfigwidgets (Old) and /work/SRC/openSUSE:Factory/.kconfigwidgets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kconfigwidgets" Changes: -------- --- /work/SRC/openSUSE:Factory/kconfigwidgets/kconfigwidgets.changes 2014-02-28 16:24:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kconfigwidgets.new/kconfigwidgets.changes 2014-03-10 12:17:57.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 4 16:38:25 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 4.97.0: + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-alpha2.php + +------------------------------------------------------------------- Old: ---- kconfigwidgets-4.96.0.tar.xz New: ---- kconfigwidgets-4.97.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kconfigwidgets.spec ++++++ --- /var/tmp/diff_new_pack.aSPJrq/_old 2014-03-10 12:17:58.000000000 +0100 +++ /var/tmp/diff_new_pack.aSPJrq/_new 2014-03-10 12:17:58.000000000 +0100 @@ -16,12 +16,12 @@ # -%define lname libKF5ConfigWidgets4 +%define lname libKF5ConfigWidgets5 Name: kconfigwidgets -Version: 4.96.0 +Version: 4.97.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.10 +BuildRequires: extra-cmake-modules >= 0.0.11 BuildRequires: fdupes BuildRequires: kauth-devel >= %{_kf5_version} BuildRequires: kcodecs-devel >= %{_kf5_version} @@ -49,6 +49,7 @@ %package -n %lname Summary: Widgets for configuration dialogs Group: System/GUI/KDE +Obsoletes: libKF5ConfigWidgets4 %description -n %lname KConfigWidgets provides easy-to-use classes to create configuration dialogs, as @@ -58,7 +59,7 @@ Summary: Widgets for configuration dialogs: Build Environment Group: Development/Libraries/KDE Requires: %lname = %{version} -Requires: extra-cmake-modules >= 0.0.10 +Requires: extra-cmake-modules >= 0.0.11 Requires: kauth-devel >= %{_kf5_version} Requires: kcodecs-devel >= %{_kf5_version} Requires: kconfig-devel >= %{_kf5_version} ++++++ kconfigwidgets-4.96.0.tar.xz -> kconfigwidgets-4.97.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfigwidgets-4.96.0/CMakeLists.txt new/kconfigwidgets-4.97.0/CMakeLists.txt --- old/kconfigwidgets-4.96.0/CMakeLists.txt 2014-02-05 00:02:37.000000000 +0100 +++ new/kconfigwidgets-4.97.0/CMakeLists.txt 2014-03-01 12:50:19.000000000 +0100 @@ -2,7 +2,7 @@ project(KConfigWidgets) -find_package(ECM 0.0.10 REQUIRED NO_MODULE) +find_package(ECM 0.0.11 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) set(REQUIRED_QT_VERSION "5.2.0") @@ -15,11 +15,12 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "4.96.0") +set(KF5_VERSION "4.97.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KCONFIGWIDGETS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kconfigwidgets_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ConfigWidgetsConfigVersion.cmake") + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ConfigWidgetsConfigVersion.cmake" + SOVERSION 5) if(NOT kdelibs_SOURCE_DIR) find_package(KF5Auth ${KF5_VERSION} REQUIRED) @@ -47,9 +48,9 @@ # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5ConfigWidgets") -include(CMakePackageConfigHelpers) +include(ECMPackageConfigHelpers) -configure_package_config_file( +ecm_configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5ConfigWidgetsConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5ConfigWidgetsConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfigwidgets-4.96.0/autotests/CMakeLists.txt new/kconfigwidgets-4.97.0/autotests/CMakeLists.txt --- old/kconfigwidgets-4.96.0/autotests/CMakeLists.txt 2014-02-05 00:02:37.000000000 +0100 +++ new/kconfigwidgets-4.97.0/autotests/CMakeLists.txt 2014-03-01 12:50:19.000000000 +0100 @@ -1,18 +1,11 @@ find_package(Qt5 5.2.0 CONFIG REQUIRED Test) -include(ECMMarkAsTest) +include(ECMAddTests) -macro(KCONFIGWIDGETS_TESTS) - foreach(_testname ${ARGN}) - add_executable(${_testname} ${_testname}.cpp) - add_test(kconfigwidgets-${_testname} ${_testname}) - ecm_mark_as_test(${_testname}) - target_link_libraries(${_testname} Qt5::Test KF5::ConfigWidgets) - endforeach(_testname) -endmacro() +ecm_add_test(kstandardactiontest.cpp NAME_PREFIX "kconfigwidgets-" LINK_LIBRARIES Qt5::Test KF5::ConfigWidgets) + +set(kconfigdialog_unittest_SRCS kconfigdialog_unittest.cpp) +kconfig_add_kcfg_files(kconfigdialog_unittest_SRCS GENERATE_MOC signaltest.kcfgc) +ecm_add_test(${kconfigdialog_unittest_SRCS} TEST_NAME "kconfigwidgets-kconfigdialog_unittest" LINK_LIBRARIES Qt5::Test KF5::ConfigWidgets) -kconfigwidgets_tests( - kconfigdialog_unittest - kstandardactiontest -) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfigwidgets-4.96.0/autotests/kconfigdialog_unittest.cpp new/kconfigwidgets-4.97.0/autotests/kconfigdialog_unittest.cpp --- old/kconfigwidgets-4.96.0/autotests/kconfigdialog_unittest.cpp 2014-02-05 00:02:37.000000000 +0100 +++ new/kconfigwidgets-4.97.0/autotests/kconfigdialog_unittest.cpp 2014-03-01 12:50:19.000000000 +0100 @@ -25,11 +25,17 @@ #include <QPushButton> #include <QComboBox> #include <QSpinBox> +#include <QLineEdit> +#include <QSignalSpy> #include <kconfigdialog.h> #include <kconfigskeleton.h> #include <kcolorcombo.h> +#include "signaltest.h" + +static const auto CONFIG_FILE = QStringLiteral("kconfigdialog_unittestrc"); + class ComboBoxPage : public QWidget { public: @@ -62,7 +68,7 @@ class ComboSettings : public KConfigSkeleton { public: - ComboSettings() + ComboSettings() : KConfigSkeleton(CONFIG_FILE) { colorItem = new ItemColor(currentGroup(), QLatin1String("Color"), color, Qt::white); addItem(colorItem, QLatin1String("Color")); @@ -115,9 +121,11 @@ { QStandardPaths::enableTestMode(true); // Leftover configuration breaks combosTest - const QString configFile = QStandardPaths::locate(QStandardPaths::GenericConfigLocation, "kconfigdialog_unittestrc"); + const QString configFile = QStandardPaths::locate(QStandardPaths::GenericConfigLocation, CONFIG_FILE); if (!configFile.isEmpty()) { - QFile::remove(configFile); + if (!QFile::remove(configFile)) { + qWarning() << "Could not remove old config file:" << configFile; + } } } @@ -127,14 +135,14 @@ KConfigDialog *dialog = new KConfigDialog(0, "settings", skeleton); ComboBoxPage *page = new ComboBoxPage(); - QCOMPARE(page->colorCombo->color(), QColor(Qt::red)); + QCOMPARE(page->colorCombo->color().name(), QColor(Qt::red).name()); QCOMPARE(page->enumCombo->currentIndex(), 0); QCOMPARE(page->textCombo->currentText(), QString("A")); QCOMPARE(page->numInput->value(), 1); dialog->addPage(page, "General"); - QCOMPARE(page->colorCombo->color(), QColor(Qt::white)); + QCOMPARE(page->colorCombo->color().name(), QColor(Qt::white).name()); QCOMPARE(page->enumCombo->currentIndex(), 1); QCOMPARE(page->textCombo->currentText(), QLatin1String("hh:mm")); QCOMPARE(page->numInput->value(), 42); @@ -147,7 +155,7 @@ QDialogButtonBox *buttonBox = dialog->findChild<QDialogButtonBox *>(); QVERIFY(buttonBox != 0); buttonBox->button(QDialogButtonBox::Apply)->click(); - QCOMPARE(skeleton->colorItem->property().value<QColor>(), QColor(Qt::blue)); + QCOMPARE(skeleton->colorItem->property().value<QColor>().name(), QColor(Qt::blue).name()); QCOMPARE(skeleton->enumItem->property().toInt(), 2); QCOMPARE(skeleton->stringItem->property().toString(), QLatin1String("C")); QCOMPARE(skeleton->intValueItem->property().toInt(), 2); @@ -156,6 +164,57 @@ delete skeleton; } + void testKConfigCompilerSignals() + { + const QString defaultValue = QStringLiteral("default value"); + const QString changedValue = QStringLiteral("changed value"); + const QString someOtherValue = QStringLiteral("some other value"); + KConfigDialog *dialog = new KConfigDialog(0, "settings2", SignalTest::self()); + QWidget* page = new QWidget; + QLineEdit *edit = new QLineEdit(page); + edit->setObjectName(QStringLiteral("kcfg_foo")); + edit->setText(QStringLiteral("some text")); + + QSignalSpy spy(SignalTest::self(), SIGNAL(fooChanged(QString))); + QVERIFY(spy.isValid()); + // now all the magic happens + dialog->addPage(page, "General"); + + //check that default value gets loaded + QCOMPARE(spy.size(), 0); + QCOMPARE(edit->text(), defaultValue); + QCOMPARE(SignalTest::foo(), defaultValue); + + edit->setText(changedValue); + // change signal should not be emitted immediately (only on save) + QCOMPARE(spy.size(), 0); + QCOMPARE(SignalTest::foo(), defaultValue); // should be no change to skeleton + + + QDialogButtonBox *buttonBox = dialog->findChild<QDialogButtonBox *>(); + QVERIFY(buttonBox != 0); + buttonBox->button(QDialogButtonBox::Apply)->click(); // now signal should be emitted + + QCOMPARE(spy.size(), 1); + QVariantList args = spy.last(); + QCOMPARE(args.size(), 1); + QCOMPARE((QMetaType::Type)args[0].type(), QMetaType::QString); + QCOMPARE(args[0].toString(), changedValue); + QCOMPARE(SignalTest::foo(), changedValue); + + // change it to a different value + edit->setText(someOtherValue); + QCOMPARE(spy.size(), 1); + buttonBox->button(QDialogButtonBox::Apply)->click(); // now signal should be emitted + + QCOMPARE(spy.size(), 2); + args = spy.last(); + QCOMPARE(args.size(), 1); + QCOMPARE((QMetaType::Type)args[0].type(), QMetaType::QString); + QCOMPARE(args[0].toString(), someOtherValue); + QCOMPARE(SignalTest::foo(), someOtherValue); + } + }; QTEST_MAIN(KConfigDialog_UnitTest) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfigwidgets-4.96.0/autotests/signaltest.kcfg new/kconfigwidgets-4.97.0/autotests/signaltest.kcfg --- old/kconfigwidgets-4.96.0/autotests/signaltest.kcfg 1970-01-01 01:00:00.000000000 +0100 +++ new/kconfigwidgets-4.97.0/autotests/signaltest.kcfg 2014-03-01 12:50:19.000000000 +0100 @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Author: Alex Richardson --> +<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 + http://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > + <kcfgfile name="kconfigdialog_unittestrc"/> + <signal name="fooChanged"> + <argument type="String">foo</argument> + </signal> + <group name="Group1"> + <entry key="foo" type="String"> + <default>default value</default> + <emit signal="fooChanged" /> + </entry> + </group> +</kcfg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfigwidgets-4.96.0/autotests/signaltest.kcfgc new/kconfigwidgets-4.97.0/autotests/signaltest.kcfgc --- old/kconfigwidgets-4.96.0/autotests/signaltest.kcfgc 1970-01-01 01:00:00.000000000 +0100 +++ new/kconfigwidgets-4.97.0/autotests/signaltest.kcfgc 2014-03-01 12:50:19.000000000 +0100 @@ -0,0 +1,9 @@ +File=signaltest.kcfg +ClassName=SignalTest +Singleton=true +Mutators=false +MemberVariables=private +GlobalEnums=false +UseEnumTypes=false +ItemAccessors=false +DefaultValueGetters=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kconfigwidgets-4.96.0/src/CMakeLists.txt new/kconfigwidgets-4.97.0/src/CMakeLists.txt --- old/kconfigwidgets-4.96.0/src/CMakeLists.txt 2014-02-05 00:02:37.000000000 +0100 +++ new/kconfigwidgets-4.97.0/src/CMakeLists.txt 2014-03-01 12:50:19.000000000 +0100 @@ -37,7 +37,8 @@ EXPORT_NAME ConfigWidgets ) -ecm_generate_headers( +ecm_generate_headers(KConfigWidgets_HEADERS + HEADER_NAMES KCodecAction KColorScheme KColorSchemeManager @@ -52,10 +53,8 @@ KStandardAction KTipDialog - MODULE_NAME KConfigWidgets REQUIRED_HEADERS KConfigWidgets_HEADERS ) -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KConfigWidgets DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) install(TARGETS KF5ConfigWidgets EXPORT KF5ConfigWidgetsTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
