diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -142,6 +142,7 @@ PACKAGE_SETUP_AUTOMOC_VARIABLES ) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x053f00) #add_definitions(-Wno-deprecated) diff --git a/src/declarativeimports/core/corebindingsplugin.cpp b/src/declarativeimports/core/corebindingsplugin.cpp --- a/src/declarativeimports/core/corebindingsplugin.cpp +++ b/src/declarativeimports/core/corebindingsplugin.cpp @@ -64,7 +64,8 @@ if (!engine->rootContext()->contextObject()) { KDeclarative::KDeclarative kdeclarative; kdeclarative.setDeclarativeEngine(engine); - kdeclarative.setupBindings(); + kdeclarative.setupContext(); + KDeclarative::KDeclarative::setupEngine(engine); } } diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp --- a/src/plasma/package.cpp +++ b/src/plasma/package.cpp @@ -224,7 +224,7 @@ QString Package::contentsHash() const { - return d->internalPackage->contentsHash(); + return QString::fromLocal8Bit(d->internalPackage->cryptographicHash(QCryptographicHash::Sha1)); } void Package::addDirectoryDefinition(const char *key, const QString &path, const QString &name) diff --git a/src/plasmaquick/configview.cpp b/src/plasmaquick/configview.cpp --- a/src/plasmaquick/configview.cpp +++ b/src/plasmaquick/configview.cpp @@ -101,7 +101,8 @@ } else { kdeclarative.setTranslationDomain(QStringLiteral("plasma_applet_") + applet.data()->pluginMetaData().pluginId()); } - kdeclarative.setupBindings(); + kdeclarative.setupContext(); + KDeclarative::KDeclarative::setupEngine(q->engine()); // ### how to make sure to do this only once per engine? //FIXME: problem on nvidia, all windows should be transparent or won't show q->setColor(Qt::transparent); diff --git a/src/plasmaquick/view.cpp b/src/plasmaquick/view.cpp --- a/src/plasmaquick/view.cpp +++ b/src/plasmaquick/view.cpp @@ -198,7 +198,8 @@ kdeclarative.setDeclarativeEngine(engine()); //binds things like kconfig and icons kdeclarative.setTranslationDomain(QStringLiteral("plasma_shell_") + pkg.metadata().pluginId()); - kdeclarative.setupBindings(); + kdeclarative.setupContext(); + KDeclarative::KDeclarative::setupEngine(engine()); // ### how to make sure to do this only once per engine? } else { qWarning() << "Invalid home screen package"; } diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.cpp b/src/scriptengines/qml/plasmoid/containmentinterface.cpp --- a/src/scriptengines/qml/plasmoid/containmentinterface.cpp +++ b/src/scriptengines/qml/plasmoid/containmentinterface.cpp @@ -166,9 +166,7 @@ connect(m_containment.data(), &Plasma::Containment::containmentTypeChanged, this, &ContainmentInterface::containmentTypeChanged); - connect(m_containment.data()->actions(), &KActionCollection::inserted, - this, &ContainmentInterface::actionsChanged); - connect(m_containment.data()->actions(), &KActionCollection::removed, + connect(m_containment.data()->actions(), &KActionCollection::changed, this, &ContainmentInterface::actionsChanged); }