Hello community, here is the log from the commit of package kdeclarative for openSUSE:Factory checked in at 2014-12-21 11:58:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeclarative (Old) and /work/SRC/openSUSE:Factory/.kdeclarative.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdeclarative" Changes: -------- --- /work/SRC/openSUSE:Factory/kdeclarative/kdeclarative.changes 2014-11-11 01:09:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdeclarative.new/kdeclarative.changes 2014-12-21 11:58:40.000000000 +0100 @@ -1,0 +2,13 @@ +Sat Dec 6 12:53:47 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 5.5.0 + * Use Qt's method of blocking for component completion rather + than our own + * Make it possible to delay initialization of object incubated + from QmlObject + * Add guard when trying to access root object before + component is complete + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.5.0.php + +------------------------------------------------------------------- Old: ---- kdeclarative-5.4.0.tar.xz New: ---- kdeclarative-5.5.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeclarative.spec ++++++ --- /var/tmp/diff_new_pack.0Q5d4N/_old 2014-12-21 11:58:41.000000000 +0100 +++ /var/tmp/diff_new_pack.0Q5d4N/_new 2014-12-21 11:58:41.000000000 +0100 @@ -18,11 +18,11 @@ %define lname libKF5Declarative5 Name: kdeclarative -Version: 5.4.0 +Version: 5.5.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.4.0 +BuildRequires: extra-cmake-modules >= 1.5.0 BuildRequires: fdupes BuildRequires: kconfig-devel >= %{kf5_version} BuildRequires: kcoreaddons-devel >= %{kf5_version} @@ -43,7 +43,7 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/stable/frameworks/5.4/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/5.5/%{name}-%{version}.tar.xz Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kdeclarative-5.4.0.tar.xz -> kdeclarative-5.5.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.4.0/CMakeLists.txt new/kdeclarative-5.5.0/CMakeLists.txt --- old/kdeclarative-5.4.0/CMakeLists.txt 2014-11-02 13:08:30.000000000 +0100 +++ new/kdeclarative-5.5.0/CMakeLists.txt 2014-12-06 13:34:39.000000000 +0100 @@ -3,33 +3,19 @@ project(KDeclarative) # Dependencies -find_package(ECM 1.4.0 REQUIRED NO_MODULE) +find_package(ECM 1.5.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) set(REQUIRED_QT_VERSION "5.2.0") -set(KF5_VERSION "5.4.0") # handled by release scripts -set(KF5_DEP_VERSION "5.4.0") # handled by release scripts +set(KF5_VERSION "5.5.0") # handled by release scripts +set(KF5_DEP_VERSION "5.5.0") # handled by release scripts find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Qml Quick Gui) include(KDEInstallDirs) include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") - # Required KF5 frameworks to build this framework - # For example: - find_package(KF5Config ${KF5_DEP_VERSION}) - - find_package(KF5I18n ${KF5_DEP_VERSION}) - find_package(KF5IconThemes ${KF5_DEP_VERSION}) - find_package(KF5KIO ${KF5_DEP_VERSION}) - - find_package(KF5WidgetsAddons ${KF5_DEP_VERSION}) - find_package(KF5WindowSystem ${KF5_DEP_VERSION}) - find_package(KF5GlobalAccel ${KF5_DEP_VERSION}) - find_package(KF5CoreAddons ${KF5_DEP_VERSION}) - find_package(KF5GuiAddons ${KF5_DEP_VERSION}) -endif() +find_package(KF5 ${KF5_DEP_VERSION} COMPONENTS Config I18n IconThemes KIO WidgetsAddons WindowSystem GlobalAccel GuiAddons) ######################################################################### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.4.0/po/fi/kdeclarative5.po new/kdeclarative-5.5.0/po/fi/kdeclarative5.po --- old/kdeclarative-5.4.0/po/fi/kdeclarative5.po 2014-11-02 13:08:30.000000000 +0100 +++ new/kdeclarative-5.5.0/po/fi/kdeclarative5.po 2014-12-06 13:34:39.000000000 +0100 @@ -29,7 +29,7 @@ "POT-Creation-Date: 2014-04-27 20:57+0000\n" "PO-Revision-Date: 2014-04-03 16:45+0300\n" "Last-Translator: Lasse Liehu <lasse.li...@gmail.com>\n" -"Language-Team: Finnish <lokalisoi...@lists.coss.fi>\n" +"Language-Team: Finnish <kde-i18n-...@kde.org>\n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.4.0/po/se/kdeclarative5.po new/kdeclarative-5.5.0/po/se/kdeclarative5.po --- old/kdeclarative-5.4.0/po/se/kdeclarative5.po 2014-11-02 13:08:30.000000000 +0100 +++ new/kdeclarative-5.5.0/po/se/kdeclarative5.po 2014-12-06 13:34:39.000000000 +0100 @@ -21,10 +21,6 @@ #: qmlcontrols/kquickcontrols/KeySequenceItem.qml:38 #, fuzzy -#| msgid "" -#| "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." msgid "" "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." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.4.0/po/tr/kdeclarative5.po new/kdeclarative-5.5.0/po/tr/kdeclarative5.po --- old/kdeclarative-5.4.0/po/tr/kdeclarative5.po 2014-11-02 13:08:30.000000000 +0100 +++ new/kdeclarative-5.5.0/po/tr/kdeclarative5.po 2014-12-06 13:34:39.000000000 +0100 @@ -16,20 +16,21 @@ # Ozan Çağlayan <o...@pardus.org.tr>, 2010, 2011. # Serdar SOYTETİR <tulli...@gmail.com>, 2010, 2012. # Volkan Gezer <volkange...@gmail.com>, 2013, 2014. +# Kaan Ozdincer <kaanozdin...@gmail.com>, 2014. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-04-27 20:57+0000\n" -"PO-Revision-Date: 2014-04-20 02:56+0200\n" -"Last-Translator: Volkan Gezer <volkange...@gmail.com>\n" +"PO-Revision-Date: 2014-11-12 00:32+0200\n" +"Last-Translator: Kaan Ozdincer <kaanozdin...@gmail.com>\n" "Language-Team: Turkish <kde-l10n...@kde.org>\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Lokalize 1.4\n" #: qmlcontrols/kquickcontrols/KeySequenceItem.qml:38 msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.4.0/src/kdeclarative/qmlobject.cpp new/kdeclarative-5.5.0/src/kdeclarative/qmlobject.cpp --- old/kdeclarative-5.4.0/src/kdeclarative/qmlobject.cpp 2014-11-02 13:08:30.000000000 +0100 +++ new/kdeclarative-5.5.0/src/kdeclarative/qmlobject.cpp 2014-12-06 13:34:39.000000000 +0100 @@ -80,6 +80,7 @@ void maximumHeightChanged(); void preferredWidthChanged(); void preferredHeightChanged(); + void checkInitializationCompleted(); QmlObject *q; @@ -208,6 +209,10 @@ QObject *QmlObject::rootObject() const { + if (d->incubator.status() == QQmlIncubator::Loading) { + qWarning() << "Trying to use rootObject before initialization is completed, whilst using setInitializationDelayed. Forcing completion"; + d->incubator.forceCompletion(); + } return d->incubator.object(); } @@ -216,6 +221,20 @@ return d->component; } +void QmlObjectPrivate::checkInitializationCompleted() +{ + if (!incubator.isReady() && incubator.status() != QQmlIncubator::Error) { + QTimer::singleShot(0, q, SLOT(checkInitializationCompleted())); + return; + } + + if (!incubator.object()) { + errorPrint(component); + } + + emit q->finished(); +} + void QmlObject::completeInitialization(const QVariantHash &initialProperties) { d->executionEndTimer->stop(); @@ -230,15 +249,16 @@ d->incubator.m_initialProperties = initialProperties; d->component->create(d->incubator); - while (!d->incubator.isReady() && d->incubator.status() != QQmlIncubator::Error) { - QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents, 50); - } + if (d->delay) { + d->checkInitializationCompleted(); + } else { + d->incubator.forceCompletion(); - if (!d->incubator.object()) { - d->errorPrint(d->component); + if (!d->incubator.object()) { + d->errorPrint(d->component); + } + emit finished(); } - - emit finished(); } QObject *QmlObject::createObjectFromSource(const QUrl &source, QQmlContext *context, const QVariantHash &initialProperties) @@ -254,9 +274,8 @@ QmlObjectIncubator incubator; incubator.m_initialProperties = initialProperties; component->create(incubator, context ? context : d->engine->rootContext()); - while (!incubator.isReady() && incubator.status() != QQmlIncubator::Error) { - QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents, 50); - } + incubator.forceCompletion(); + QObject *object = incubator.object(); if (!component->isError() && object) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.4.0/src/kdeclarative/qmlobject.h new/kdeclarative-5.5.0/src/kdeclarative/qmlobject.h --- old/kdeclarative-5.4.0/src/kdeclarative/qmlobject.h 2014-11-02 13:08:30.000000000 +0100 +++ new/kdeclarative-5.5.0/src/kdeclarative/qmlobject.h 2014-12-06 13:34:39.000000000 +0100 @@ -194,6 +194,7 @@ QmlObjectPrivate *const d; Q_PRIVATE_SLOT(d, void scheduleExecutionEnd()) + Q_PRIVATE_SLOT(d, void checkInitializationCompleted()) }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.4.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.cpp new/kdeclarative-5.5.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.cpp --- old/kdeclarative-5.4.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.cpp 2014-11-02 13:08:30.000000000 +0100 +++ new/kdeclarative-5.5.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.cpp 2014-12-06 13:34:39.000000000 +0100 @@ -64,7 +64,6 @@ } m_sourceModel = sourceModel; if(m_sourceModel) { - setRoleNames(m_sourceModel->roleNames()); connect(m_sourceModel, SIGNAL(destroyed(QObject*)), this, SLOT(sourceDestroyed(QObject*))); @@ -232,4 +231,9 @@ } } +QHash<int, QByteArray> ColumnProxyModel::roleNames() const +{ + return m_sourceModel ? m_sourceModel->roleNames() : QHash<int, QByteArray>(); +} + #include "columnproxymodel.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.4.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.h new/kdeclarative-5.5.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.h --- old/kdeclarative-5.4.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.h 2014-11-02 13:08:30.000000000 +0100 +++ new/kdeclarative-5.5.0/src/qmlcontrols/kquickcontrolsaddons/columnproxymodel.h 2014-12-06 13:34:39.000000000 +0100 @@ -46,6 +46,7 @@ virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const; virtual int rowCount(const QModelIndex& parent = QModelIndex()) const; virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; + virtual QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE; Q_SIGNALS: void rootIndexChanged(); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
