commit kdeclarative for openSUSE:Factory
Hello community, here is the log from the commit of package kdeclarative for openSUSE:Factory checked in at 2014-09-12 17:03:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-08-16 15:42:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdeclarative.new/kdeclarative.changes 2014-09-12 17:04:42.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Sep 9 09:49:34 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 5.2.0 + * KDeclarative: added org.kde.kio component. + * For more details please see: + http://kde.org/announcements/kde-frameworks-5.2.php + +------------------------------------------------------------------- Old: ---- kdeclarative-5.1.0.tar.xz New: ---- kdeclarative-5.2.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeclarative.spec ++++++ --- /var/tmp/diff_new_pack.4ekTFc/_old 2014-09-12 17:04:45.000000000 +0200 +++ /var/tmp/diff_new_pack.4ekTFc/_new 2014-09-12 17:04:45.000000000 +0200 @@ -18,11 +18,11 @@ %define lname libKF5Declarative5 Name: kdeclarative -Version: 5.1.0 +Version: 5.2.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.1.0 +BuildRequires: extra-cmake-modules >= 1.2.0 BuildRequires: fdupes BuildRequires: kconfig-devel >= %{kf5_version} BuildRequires: kcoreaddons-devel >= %{kf5_version} ++++++ kdeclarative-5.1.0.tar.xz -> kdeclarative-5.2.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.1.0/CMakeLists.txt new/kdeclarative-5.2.0/CMakeLists.txt --- old/kdeclarative-5.1.0/CMakeLists.txt 2014-08-02 11:02:41.000000000 +0200 +++ new/kdeclarative-5.2.0/CMakeLists.txt 2014-09-09 01:45:17.000000000 +0200 @@ -3,12 +3,12 @@ project(KDeclarative) # Dependencies -find_package(ECM 1.1.0 REQUIRED NO_MODULE) +find_package(ECM 1.2.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.1.0") # handled by release scripts -set(KF5_DEP_VERSION "5.1.0") # handled by release scripts +set(KF5_VERSION "5.2.0") # handled by release scripts +set(KF5_DEP_VERSION "5.2.0") # handled by release scripts find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Qml Quick Gui) include(KDEInstallDirs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.1.0/KF5DeclarativeConfig.cmake.in new/kdeclarative-5.2.0/KF5DeclarativeConfig.cmake.in --- old/kdeclarative-5.1.0/KF5DeclarativeConfig.cmake.in 2014-08-02 11:02:41.000000000 +0200 +++ new/kdeclarative-5.2.0/KF5DeclarativeConfig.cmake.in 2014-09-09 01:45:17.000000000 +0200 @@ -1,9 +1,6 @@ @PACKAGE_INIT@ -# Required components to use this framework -# For example: -# find_dependency(Qt5Widgets "@REQUIRED_QT_VERSION@") - +find_dependency(Qt5Qml "@REQUIRED_QT_VERSION@") find_dependency(KF5KIO "@KF5_DEP_VERSION@") include("${CMAKE_CURRENT_LIST_DIR}/KF5DeclarativeTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.1.0/README.md new/kdeclarative-5.2.0/README.md --- old/kdeclarative-5.1.0/README.md 2014-08-02 11:02:41.000000000 +0200 +++ new/kdeclarative-5.2.0/README.md 2014-09-09 01:45:17.000000000 +0200 @@ -6,9 +6,3 @@ KDeclarative provides integration of QML and KDE work spaces. -## Links - -- Home page: <https://projects.kde.org/projects/frameworks/kdeclarative> -- Mailing list: <https://mail.kde.org/mailman/listinfo/kde-frameworks-devel> -- IRC channel: #kde-devel on Freenode -- Git repository: <https://projects.kde.org/projects/frameworks/kdeclarative/repository> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.1.0/metainfo.yaml new/kdeclarative-5.2.0/metainfo.yaml --- old/kdeclarative-5.1.0/metainfo.yaml 2014-08-02 11:02:41.000000000 +0200 +++ new/kdeclarative-5.2.0/metainfo.yaml 2014-09-09 01:45:17.000000000 +0200 @@ -8,3 +8,7 @@ portingAid: false deprecated: false release: true +libraries: + - qmake: KDeclarative + cmake: "KF5::Declarative" +cmakename: KF5Declarative diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.1.0/po/cs/kdeclarative5.po new/kdeclarative-5.2.0/po/cs/kdeclarative5.po --- old/kdeclarative-5.1.0/po/cs/kdeclarative5.po 2014-08-02 11:02:41.000000000 +0200 +++ new/kdeclarative-5.2.0/po/cs/kdeclarative5.po 2014-09-09 01:45:17.000000000 +0200 @@ -18,6 +18,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Lokalize 1.5\n" +"X-Language: cs_CZ\n" +"X-Source-Language: en_US\n" #: qmlcontrols/kquickcontrols/KeySequenceItem.qml:38 msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.1.0/po/fi/kdeclarative5.po new/kdeclarative-5.2.0/po/fi/kdeclarative5.po --- old/kdeclarative-5.1.0/po/fi/kdeclarative5.po 2014-08-02 11:02:41.000000000 +0200 +++ new/kdeclarative-5.2.0/po/fi/kdeclarative5.po 2014-09-09 01:45:17.000000000 +0200 @@ -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.liehu@gmail.com>\n" -"Language-Team: Finnish <lokalisointi@lists.coss.fi>\n" +"Language-Team: Finnish <kde-i18n-doc@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.1.0/po/zh_CN/kdeclarative5.po new/kdeclarative-5.2.0/po/zh_CN/kdeclarative5.po --- old/kdeclarative-5.1.0/po/zh_CN/kdeclarative5.po 2014-08-02 11:02:41.000000000 +0200 +++ new/kdeclarative-5.2.0/po/zh_CN/kdeclarative5.po 2014-09-09 01:45:17.000000000 +0200 @@ -26,10 +26,6 @@ "X-Generator: Lokalize 1.5\n" #: qmlcontrols/kquickcontrols/KeySequenceItem.qml:38 -#| 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.1.0/src/qmlcontrols/CMakeLists.txt new/kdeclarative-5.2.0/src/qmlcontrols/CMakeLists.txt --- old/kdeclarative-5.1.0/src/qmlcontrols/CMakeLists.txt 2014-08-02 11:02:41.000000000 +0200 +++ new/kdeclarative-5.2.0/src/qmlcontrols/CMakeLists.txt 2014-09-09 01:45:17.000000000 +0200 @@ -8,4 +8,9 @@ if(KF5CoreAddons_FOUND) add_subdirectory(kcoreaddons) -endif() \ No newline at end of file +endif() + + +if(KF5KIO_FOUND) + add_subdirectory(kioplugin) +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.1.0/src/qmlcontrols/kcoreaddons/kuserproxy.cpp new/kdeclarative-5.2.0/src/qmlcontrols/kcoreaddons/kuserproxy.cpp --- old/kdeclarative-5.1.0/src/qmlcontrols/kcoreaddons/kuserproxy.cpp 2014-08-02 11:02:41.000000000 +0200 +++ new/kdeclarative-5.2.0/src/qmlcontrols/kcoreaddons/kuserproxy.cpp 2014-09-09 01:45:17.000000000 +0200 @@ -19,8 +19,6 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. */ -#include <unistd.h> - #include "kuserproxy.h" #include <QFile> #include <QHostInfo> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.1.0/src/qmlcontrols/kioplugin/CMakeLists.txt new/kdeclarative-5.2.0/src/qmlcontrols/kioplugin/CMakeLists.txt --- old/kdeclarative-5.1.0/src/qmlcontrols/kioplugin/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeclarative-5.2.0/src/qmlcontrols/kioplugin/CMakeLists.txt 2014-09-09 01:45:17.000000000 +0200 @@ -0,0 +1,18 @@ +project(kioplugin) + +set(kioplugin_SRCS + kioplugin.cpp + krunproxy.cpp + ) + +add_library(kio SHARED ${kioplugin_SRCS}) +target_link_libraries(kio + Qt5::Core + Qt5::Qml + KF5::KIOWidgets +) + +install(TARGETS kio DESTINATION ${QML_INSTALL_DIR}/org/kde/kio) + +install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/kio) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.1.0/src/qmlcontrols/kioplugin/kioplugin.cpp new/kdeclarative-5.2.0/src/qmlcontrols/kioplugin/kioplugin.cpp --- old/kdeclarative-5.1.0/src/qmlcontrols/kioplugin/kioplugin.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeclarative-5.2.0/src/qmlcontrols/kioplugin/kioplugin.cpp 2014-09-09 01:45:17.000000000 +0200 @@ -0,0 +1,30 @@ +/* + * Copyright 2014 Antonis Tsiapaliokas <antonis.tsiapaliokas@kde.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "kioplugin.h" + +#include <QtQml> + +#include "krunproxy.h" + +void KioPlugin::registerTypes(const char *uri) +{ + Q_ASSERT(uri == QLatin1String("org.kde.kio")); + + qmlRegisterType<KRunProxy>(uri, 1, 0, "KRun"); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.1.0/src/qmlcontrols/kioplugin/kioplugin.h new/kdeclarative-5.2.0/src/qmlcontrols/kioplugin/kioplugin.h --- old/kdeclarative-5.1.0/src/qmlcontrols/kioplugin/kioplugin.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeclarative-5.2.0/src/qmlcontrols/kioplugin/kioplugin.h 2014-09-09 01:45:17.000000000 +0200 @@ -0,0 +1,33 @@ +/* + * Copyright 2014 Antonis Tsiapaliokas <antonis.tsiapaliokas@kde.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef KIOPLUGIN_H +#define KIOPLUGIN_H + +#include <QQmlExtensionPlugin> + +class KioPlugin : public QQmlExtensionPlugin +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") + +public: + void registerTypes(const char *uri); +}; + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.1.0/src/qmlcontrols/kioplugin/krunproxy.cpp new/kdeclarative-5.2.0/src/qmlcontrols/kioplugin/krunproxy.cpp --- old/kdeclarative-5.1.0/src/qmlcontrols/kioplugin/krunproxy.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeclarative-5.2.0/src/qmlcontrols/kioplugin/krunproxy.cpp 2014-09-09 01:45:17.000000000 +0200 @@ -0,0 +1,52 @@ +/* + * Copyright 2014 Antonis Tsiapaliokas <antonis.tsiapaliokas@kde.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "krunproxy.h" + +#include <QMimeDatabase> + +#include <KRun> +#include <KService> + +KRunProxy::KRunProxy(QObject* parent) + : QObject(parent) +{ +} + +bool KRunProxy::openUrl(const QString &filePath) +{ + QMimeDatabase db; + QMimeType mime = db.mimeTypeForFile(filePath); + const QString fileMymeType = mime.name(); + + if (fileMymeType == QStringLiteral("application/x-executable") || !mime.isValid()) { + //for security reasons we should not be able to execute applications. + //We should use its desktop file to access it. + return false; + } + + if (fileMymeType == QStringLiteral("application/x-desktop")) { + // If our mimetype is a desktop file, then we don't won't to open + // the desktop file itself but the application in which it is associated + // with. + KService::Ptr service = KService::serviceByDesktopPath(filePath); + return KRun::run(*service, QList<QUrl>(), 0); + } else { + return KRun::runUrl(QUrl(filePath), fileMymeType, 0); + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.1.0/src/qmlcontrols/kioplugin/krunproxy.h new/kdeclarative-5.2.0/src/qmlcontrols/kioplugin/krunproxy.h --- old/kdeclarative-5.1.0/src/qmlcontrols/kioplugin/krunproxy.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeclarative-5.2.0/src/qmlcontrols/kioplugin/krunproxy.h 2014-09-09 01:45:17.000000000 +0200 @@ -0,0 +1,38 @@ +/* + * Copyright 2014 Antonis Tsiapaliokas <antonis.tsiapaliokas@kde.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef KRUNPROXY_H +#define KRUNPROXY_H + +#include <QObject> + +class KRunProxy : public QObject +{ + Q_OBJECT + + public: + + explicit KRunProxy (QObject* parent = 0); + + /** + * opens the url from the existing file + */ + Q_INVOKABLE bool openUrl(const QString &filePath); +}; + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.1.0/src/qmlcontrols/kioplugin/qmldir new/kdeclarative-5.2.0/src/qmlcontrols/kioplugin/qmldir --- old/kdeclarative-5.1.0/src/qmlcontrols/kioplugin/qmldir 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeclarative-5.2.0/src/qmlcontrols/kioplugin/qmldir 2014-09-09 01:45:17.000000000 +0200 @@ -0,0 +1,3 @@ +module org.kde.kio +plugin kio + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.1.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp new/kdeclarative-5.2.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp --- old/kdeclarative-5.1.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp 2014-08-02 11:02:41.000000000 +0200 +++ new/kdeclarative-5.2.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.cpp 2014-09-09 01:45:17.000000000 +0200 @@ -60,6 +60,22 @@ return m_acceptedButtons; } +Qt::CursorShape MouseEventListener::cursorShape() const +{ + return cursor().shape(); +} + +void MouseEventListener::setCursorShape(Qt::CursorShape shape) +{ + if (cursor().shape() == shape) { + return; + } + + setCursor(shape); + + emit cursorShapeChanged(); +} + void MouseEventListener::setAcceptedButtons(Qt::MouseButtons buttons) { if (buttons == m_acceptedButtons) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeclarative-5.1.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h new/kdeclarative-5.2.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h --- old/kdeclarative-5.1.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h 2014-08-02 11:02:41.000000000 +0200 +++ new/kdeclarative-5.2.0/src/qmlcontrols/kquickcontrolsaddons/mouseeventlistener.h 2014-09-09 01:45:17.000000000 +0200 @@ -152,6 +152,12 @@ Q_PROPERTY(Qt::MouseButtons acceptedButtons READ acceptedButtons WRITE setAcceptedButtons NOTIFY acceptedButtonsChanged) /** + * This property holds the cursor shape for this mouse area. + * Note that on platforms that do not display a mouse cursor this may have no effect. + */ + Q_PROPERTY(Qt::CursorShape cursorShape READ cursorShape WRITE setCursorShape RESET unsetCursor NOTIFY cursorShapeChanged) + + /** * True if the mouse is pressed in the item or any of its children */ Q_PROPERTY(bool pressed READ isPressed NOTIFY pressedChanged) @@ -168,6 +174,9 @@ Qt::MouseButtons acceptedButtons() const; void setAcceptedButtons(Qt::MouseButtons buttons); + Qt::CursorShape cursorShape() const; + void setCursorShape(Qt::CursorShape shape); + protected: void hoverEnterEvent(QHoverEvent *event); void hoverLeaveEvent(QHoverEvent *event); @@ -188,6 +197,7 @@ void containsMouseChanged(bool containsMouseChanged); void hoverEnabledChanged(bool hoverEnabled); void acceptedButtonsChanged(); + void cursorShapeChanged(); void pressedChanged(); private Q_SLOTS: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de