From f7208d7d21e57de8a03e7898909b801f571e4cd7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 17 Jul 2014 08:59:54 +0000 Subject: [PATCH 1/7] SVN_SILENT made messages (.desktop file) --- autotests/data/signedPackage/metadata.desktop | 1 + autotests/data/testpackage/metadata.desktop | 1 + autotests/packagemetadatatest.desktop | 2 ++ examples/applets/bugreport/metadata.desktop | 2 ++ examples/applets/compactrepresentation/metadata.desktop | 1 + examples/applets/conditionalloader/metadata.desktop | 1 + examples/applets/config/metadata.desktop | 1 + examples/applets/helloworld/metadata.desktop | 1 + examples/applets/nowplaying/metadata.desktop | 1 + examples/applets/testcomponents/metadata.desktop | 1 + examples/applets/testtheme/metadata.desktop | 1 + examples/containments/testcontainment/metadata.desktop | 1 + src/desktoptheme/air/metadata.desktop | 2 ++ src/desktoptheme/breeze-dark/metadata.desktop | 2 +- src/desktoptheme/breeze/metadata.desktop | 3 ++- src/desktoptheme/oxygen/metadata.desktop | 1 + src/kpart/plasma-kpart.desktop | 1 + src/plasma/data/servicetypes/plasma-dataengine.desktop | 1 + src/plasma/data/servicetypes/plasma-lookandfeel.desktop | 1 + src/plasma/data/servicetypes/plasma-packagestructure.desktop | 1 + src/plasma/data/servicetypes/plasma-scriptengine.desktop | 1 + src/plasma/data/servicetypes/plasma-service.desktop | 1 + src/plasma/data/servicetypes/plasma-shell.desktop | 1 + src/platformstatus/kded_platformstatus.desktop | 1 + .../python/plasma-scriptengine-dataengine-python.desktop | 1 + .../ruby/plasma-scriptengine-ruby-dataengine.desktop | 1 + tests/testengine/plasma-dataengine-testengine.desktop | 1 + 27 files changed, 31 insertions(+), 2 deletions(-) diff --git a/autotests/data/signedPackage/metadata.desktop b/autotests/data/signedPackage/metadata.desktop index 9d9cca2b0..85a6003af 100644 --- a/autotests/data/signedPackage/metadata.desktop +++ b/autotests/data/signedPackage/metadata.desktop @@ -25,6 +25,7 @@ Name[sr@latin]=JavaScript operacije nad fajlovima Name[sv]=Filåtgärder för Javascript Name[uk]=Дії з файлами за допомогою JavaScript Name[x-test]=xxJavaScript File Operationsxx +Name[zh_CN]=JavaScript 文件操作 Name[zh_TW]=JavaScript 檔案操作 Comment=Demonstrates accessing data via HTTP in JavaScript Comment[bs]=Demonstrira pristupanje padacima preko HTTP u JavaScript diff --git a/autotests/data/testpackage/metadata.desktop b/autotests/data/testpackage/metadata.desktop index 8a9e44d73..925330f19 100644 --- a/autotests/data/testpackage/metadata.desktop +++ b/autotests/data/testpackage/metadata.desktop @@ -29,6 +29,7 @@ Name[sr@latin]=Probni paket Name[sv]=Testpaket Name[uk]=Тестовий пакунок Name[x-test]=xxTest Packagexx +Name[zh_CN]=测试包 Name[zh_TW]=測試套件 Type=Service diff --git a/autotests/packagemetadatatest.desktop b/autotests/packagemetadatatest.desktop index 245e81fee..5e8200830 100644 --- a/autotests/packagemetadatatest.desktop +++ b/autotests/packagemetadatatest.desktop @@ -27,6 +27,7 @@ Name[tr]=Paket metadata test dosyası Name[ug]=بوغچا مېتا سانلىق-مەلۇمات سىناق ھۆججەت Name[uk]=Файл перевірки метаданих пакунка Name[x-test]=xxPackage metadata test filexx +Name[zh_CN]=工具包元数据测试文件 Name[zh_TW]=套件中繼資料測試檔 Comment=A test desktop file to test the PackageMetaData class. Comment[ar]=ملف سطح مكتب اختباري لاختبار صنف بيانات الحزمة الوصفية (PackageMetaData). @@ -56,6 +57,7 @@ Comment[tr]=PackageMetaData sınıfını test etmek için bir desktop dosyası. Comment[ug]=PackageMetaData خىلىدىكى سىناشقا ئىشلىتىدىغان desktop تىپىدىكى ھۆججەت. Comment[uk]=Тестовий стільничний файл для перевірки класу PackageMetaData. Comment[x-test]=xxA test desktop file to test the PackageMetaData class.xx +Comment[zh_CN]=用于测试 PackageMetaData 类的 desktop 类型文件。 Comment[zh_TW]=測試 PackageMetaData 類別的桌面檔 Icon=test diff --git a/examples/applets/bugreport/metadata.desktop b/examples/applets/bugreport/metadata.desktop index 609cfcdab..4aa1898e1 100644 --- a/examples/applets/bugreport/metadata.desktop +++ b/examples/applets/bugreport/metadata.desktop @@ -24,6 +24,7 @@ Comment[sr@latin]=Prijavite grešku u Plasmi Comment[sv]=Rapportera ett fel i Plasma Comment[uk]=Повідомити про ваду у Плазмі Comment[x-test]=xxReport a bug in Plasmaxx +Comment[zh_CN]=报告 Plasma 的错误 Comment[zh_TW]=在 Plasma 中回報問題 Encoding=UTF-8 Keywords=plasma,bugzilla,bug,development,support @@ -75,6 +76,7 @@ Name[sr@latin]=Greška Name[sv]=Fel Name[uk]=Вада Name[x-test]=xxBugxx +Name[zh_CN]=臭虫 Name[zh_TW]=錯誤 Type=Service Icon=kbugbuster diff --git a/examples/applets/compactrepresentation/metadata.desktop b/examples/applets/compactrepresentation/metadata.desktop index 7f766c304..97d63528b 100644 --- a/examples/applets/compactrepresentation/metadata.desktop +++ b/examples/applets/compactrepresentation/metadata.desktop @@ -29,6 +29,7 @@ Name[sv]=hello world Name[tr]=Merhaba Dünya Name[uk]=Привіт, світе Name[x-test]=xxhello worldxx +Name[zh_CN]=hello world Name[zh_TW]=hello world Type=Service Icon=package_toys diff --git a/examples/applets/conditionalloader/metadata.desktop b/examples/applets/conditionalloader/metadata.desktop index 9c7b81c8c..c1dd580d6 100644 --- a/examples/applets/conditionalloader/metadata.desktop +++ b/examples/applets/conditionalloader/metadata.desktop @@ -28,6 +28,7 @@ Name[sr@latin]=Proba apleta Name[sv]=Miniprogramtest Name[uk]=Тест аплету Name[x-test]=xxApplet Testxx +Name[zh_CN]=小部件测试 Name[zh_TW]=小程式測試 Type=Service diff --git a/examples/applets/config/metadata.desktop b/examples/applets/config/metadata.desktop index 1dc8fb97e..17c64f2d9 100644 --- a/examples/applets/config/metadata.desktop +++ b/examples/applets/config/metadata.desktop @@ -28,6 +28,7 @@ Name[sv]=Inställningstest Name[tr]=Yapılandırma Testi Name[uk]=Перевірка налаштувань Name[x-test]=xxConfiguration testxx +Name[zh_CN]=配置测试 Name[zh_TW]=設定測試 Type=Service diff --git a/examples/applets/helloworld/metadata.desktop b/examples/applets/helloworld/metadata.desktop index b19af4c94..a295404e7 100644 --- a/examples/applets/helloworld/metadata.desktop +++ b/examples/applets/helloworld/metadata.desktop @@ -29,6 +29,7 @@ Name[sv]=hello world Name[tr]=Merhaba Dünya Name[uk]=Привіт, світе Name[x-test]=xxhello worldxx +Name[zh_CN]=hello world Name[zh_TW]=hello world Type=Service Icon=package_toys diff --git a/examples/applets/nowplaying/metadata.desktop b/examples/applets/nowplaying/metadata.desktop index c217234b7..146381f6b 100644 --- a/examples/applets/nowplaying/metadata.desktop +++ b/examples/applets/nowplaying/metadata.desktop @@ -24,6 +24,7 @@ Name[sr@latin]=Trenutna svirka (QML) Name[sv]=Spelar nu (QML) Name[uk]=Зараз відтворюється (QML) Name[x-test]=xxNow playing (QML)xx +Name[zh_CN]=正在播放 (QML) Name[zh_TW]=現正播放（QML） Comment=A proof of concept media player controller qml Comment[bs]=Dokaz koncepta media player upravljača qml diff --git a/examples/applets/testcomponents/metadata.desktop b/examples/applets/testcomponents/metadata.desktop index 033f9d7f8..678396bf0 100644 --- a/examples/applets/testcomponents/metadata.desktop +++ b/examples/applets/testcomponents/metadata.desktop @@ -25,6 +25,7 @@ Name[sr@latin]=Proba komponenata Name[sv]=Komponenttest Name[uk]=Тестування компонентів Name[x-test]=xxComponents Testxx +Name[zh_CN]=组件测试 Name[zh_TW]=組件測試 Type=Service Icon=plasma diff --git a/examples/applets/testtheme/metadata.desktop b/examples/applets/testtheme/metadata.desktop index 831290c28..b4d42878c 100644 --- a/examples/applets/testtheme/metadata.desktop +++ b/examples/applets/testtheme/metadata.desktop @@ -24,6 +24,7 @@ Name[sr@latin]=Proba teme Name[sv]=Tematest Name[uk]=Тестування теми Name[x-test]=xxTheme Testxx +Name[zh_CN]=主题测试 Name[zh_TW]=主題測試 Type=Service Icon=preferences-desktop-appearance diff --git a/examples/containments/testcontainment/metadata.desktop b/examples/containments/testcontainment/metadata.desktop index 2f55d699a..52f604c32 100644 --- a/examples/containments/testcontainment/metadata.desktop +++ b/examples/containments/testcontainment/metadata.desktop @@ -25,6 +25,7 @@ Name[sr@latin]=Proba sadržalaca Name[sv]=Omgivningstest Name[uk]=Тестування контейнера Name[x-test]=xxContainment Testxx +Name[zh_CN]=容器测试 Name[zh_TW]=容器測試 Type=Service diff --git a/src/desktoptheme/air/metadata.desktop b/src/desktoptheme/air/metadata.desktop index 1e5db7266..1194d1b47 100644 --- a/src/desktoptheme/air/metadata.desktop +++ b/src/desktoptheme/air/metadata.desktop @@ -31,6 +31,7 @@ Name[tr]=Air Name[ug]=ھاۋا Name[uk]=Air Name[x-test]=xxAirxx +Name[zh_CN]=大气 Name[zh_TW]=Air Comment=A breath of fresh air Comment[ar]=نسمة من الهواء المنعش @@ -63,6 +64,7 @@ Comment[tr]=Temiz havadan bir nefes Comment[ug]=ساپ ھاۋادىن نەپەسلىنىش Comment[uk]=Ковток свіжого повітря Comment[x-test]=xxA breath of fresh airxx +Comment[zh_CN]=呼吸清新空气 Comment[zh_TW]=吸一口新鮮空氣 diff --git a/src/desktoptheme/breeze-dark/metadata.desktop b/src/desktoptheme/breeze-dark/metadata.desktop index 7c23eb87a..2cbf41086 100644 --- a/src/desktoptheme/breeze-dark/metadata.desktop +++ b/src/desktoptheme/breeze-dark/metadata.desktop @@ -15,7 +15,7 @@ Name[pt]=Brisa Escura Name[pt_BR]=Breeze Dark Name[ru]=Breeze, тёмный вариант Name[sk]=Tmavý vánok -Name[sl]=Vetrič (temna) +Name[sl]=Sapica (temna) Name[sr]=Поветарац тамни Name[sr@ijekavian]=Поветарац тамни Name[sr@ijekavianlatin]=Povetarac tamni diff --git a/src/desktoptheme/breeze/metadata.desktop b/src/desktoptheme/breeze/metadata.desktop index 6a6d2d2cf..edb8d9950 100644 --- a/src/desktoptheme/breeze/metadata.desktop +++ b/src/desktoptheme/breeze/metadata.desktop @@ -15,7 +15,7 @@ Name[pt]=Brisa Name[pt_BR]=Breeze Name[ru]=Breeze Name[sk]=Vánok -Name[sl]=Vetrič +Name[sl]=Sapica Name[sr]=Поветарац Name[sr@ijekavian]=Поветарац Name[sr@ijekavianlatin]=Povetarac @@ -23,6 +23,7 @@ Name[sr@latin]=Povetarac Name[sv]=Breeze Name[uk]=Breeze Name[x-test]=xxBreezexx +Name[zh_CN]=微风 Name[zh_TW]=Breeze Dark diff --git a/src/desktoptheme/oxygen/metadata.desktop b/src/desktoptheme/oxygen/metadata.desktop index 28d849a62..e2176014a 100644 --- a/src/desktoptheme/oxygen/metadata.desktop +++ b/src/desktoptheme/oxygen/metadata.desktop @@ -31,6 +31,7 @@ Name[tr]=Oxygen Name[ug]=ئوكسېگىن Name[uk]=Oxygen Name[x-test]=xxOxygenxx +Name[zh_CN]=Oxygen Name[zh_TW]=Oxygen Comment=Theme done in the Oxygen style Comment[ar]=سمة مُصمَّمة بِنمط أوكسجين diff --git a/src/kpart/plasma-kpart.desktop b/src/kpart/plasma-kpart.desktop index 0e80215e6..1eef5550b 100644 --- a/src/kpart/plasma-kpart.desktop +++ b/src/kpart/plasma-kpart.desktop @@ -29,6 +29,7 @@ Name[tr]=plasma-kpart Name[ug]=plasma-kpart Name[uk]=plasma-kpart Name[x-test]=xxplasma-kpartxx +Name[zh_CN]=plasma-kpart Name[zh_TW]=plasma-kpart Type=Service ServiceTypes=KParts/Part diff --git a/src/plasma/data/servicetypes/plasma-dataengine.desktop b/src/plasma/data/servicetypes/plasma-dataengine.desktop index 96368a0d0..c27a9104f 100644 --- a/src/plasma/data/servicetypes/plasma-dataengine.desktop +++ b/src/plasma/data/servicetypes/plasma-dataengine.desktop @@ -32,5 +32,6 @@ Comment[tr]=Plasma Veri Motoru Comment[ug]=Plasma سانلىق-مەلۇمات ماتورى Comment[uk]=Рушій даних Плазми Comment[x-test]=xxPlasma Data Enginexx +Comment[zh_CN]=Plasma 数据引擎 Comment[zh_TW]=Plasma 資料引擎 diff --git a/src/plasma/data/servicetypes/plasma-lookandfeel.desktop b/src/plasma/data/servicetypes/plasma-lookandfeel.desktop index 78fe79d0b..d75c7f5be 100644 --- a/src/plasma/data/servicetypes/plasma-lookandfeel.desktop +++ b/src/plasma/data/servicetypes/plasma-lookandfeel.desktop @@ -27,6 +27,7 @@ Name[sr@latin]=Plasma izgled i osećaj Name[sv]=Plasma utseende och känsla Name[uk]=Вигляд і поведінка Плазми Name[x-test]=xxPlasma Look and Feelxx +Name[zh_CN]=Plasma 观感 Name[zh_TW]=Plasma 外觀與感覺 Comment=Defines the Visual Language for Plasma Shells Comment[bs]=Definicija vizuelnog jezika za plazma školjke diff --git a/src/plasma/data/servicetypes/plasma-packagestructure.desktop b/src/plasma/data/servicetypes/plasma-packagestructure.desktop index 9b5cef870..254c5fe98 100644 --- a/src/plasma/data/servicetypes/plasma-packagestructure.desktop +++ b/src/plasma/data/servicetypes/plasma-packagestructure.desktop @@ -30,6 +30,7 @@ Comment[tr]=Plasma paketi yapı tanımlaması Comment[ug]=Plasma بوغچا قۇرۇلما ئېنىقلىمىسى Comment[uk]=Опис структури пакунка плазми Comment[x-test]=xxPlasma package structure definitionxx +Comment[zh_CN]=Plasma 包结构定义 Comment[zh_TW]=Plasma 套件結構定義 [PropertyDef::X-Plasma-PackageFileFilter] diff --git a/src/plasma/data/servicetypes/plasma-scriptengine.desktop b/src/plasma/data/servicetypes/plasma-scriptengine.desktop index 0bb9df4fd..2c3e2659d 100644 --- a/src/plasma/data/servicetypes/plasma-scriptengine.desktop +++ b/src/plasma/data/servicetypes/plasma-scriptengine.desktop @@ -31,6 +31,7 @@ Comment[tr]=Plasma için betik dili eklentisi Comment[ug]=Plasma نىڭ قوليازما تىل كېڭەيتىلمىسى Comment[uk]=Розширення скриптових мов для Плазми Comment[x-test]=xxScripting language extension for Plasmaxx +Comment[zh_CN]=Plasma 的脚本语言扩展 Comment[zh_TW]=Plasma 文稿語言延伸 [PropertyDef::X-Plasma-ComponentTypes] diff --git a/src/plasma/data/servicetypes/plasma-service.desktop b/src/plasma/data/servicetypes/plasma-service.desktop index c3846b4c7..e7377401e 100644 --- a/src/plasma/data/servicetypes/plasma-service.desktop +++ b/src/plasma/data/servicetypes/plasma-service.desktop @@ -32,4 +32,5 @@ Comment[tr]=Plasma servisi Comment[ug]=Plasma مۇلازىمىتى Comment[uk]=Служба Плазми Comment[x-test]=xxPlasma servicexx +Comment[zh_CN]=Plasma 服务 Comment[zh_TW]=Plasma 服務 diff --git a/src/plasma/data/servicetypes/plasma-shell.desktop b/src/plasma/data/servicetypes/plasma-shell.desktop index 451417878..e2c83ba8b 100644 --- a/src/plasma/data/servicetypes/plasma-shell.desktop +++ b/src/plasma/data/servicetypes/plasma-shell.desktop @@ -27,6 +27,7 @@ Name[sr@latin]=Plasma školjka Name[sv]=Plasma skal Name[uk]=Оболонка Плазми Name[x-test]=xxPlasma Shellxx +Name[zh_CN]=Plasma 外壳 Name[zh_TW]=Plasma Shell Comment=Plasma Shell Components Comment[ar]=مكوّنات صَدفة پلازما diff --git a/src/platformstatus/kded_platformstatus.desktop b/src/platformstatus/kded_platformstatus.desktop index bf8d39aaf..69c86a619 100644 --- a/src/platformstatus/kded_platformstatus.desktop +++ b/src/platformstatus/kded_platformstatus.desktop @@ -32,6 +32,7 @@ Name[sr@latin]=Stanje platforme Name[sv]=Plattformstatus Name[uk]=Стан платформи Name[x-test]=xxPlatform Statusxx +Name[zh_CN]=平台状态 Name[zh_TW]=平台狀態 Comment=Tracks the current shell package and the platform definition strings. Comment[bs]=Prati trenutni paket školjke i definicijone nizove platforme diff --git a/src/scriptengines/python/plasma-scriptengine-dataengine-python.desktop b/src/scriptengines/python/plasma-scriptengine-dataengine-python.desktop index 8c1e65ea4..17e6b86a4 100644 --- a/src/scriptengines/python/plasma-scriptengine-dataengine-python.desktop +++ b/src/scriptengines/python/plasma-scriptengine-dataengine-python.desktop @@ -26,6 +26,7 @@ Name[sr@latin]=Python datomotor Name[sv]=Python datagränssnitt Name[uk]=Рушій даних Python Name[x-test]=xxPython data enginexx +Name[zh_CN]=Python 数据引擎 Name[zh_TW]=Python 資料引擎 Comment=Plasma data engine support for Python Comment[ar]=دعم محرّك بيانات پلازما لِبايثون diff --git a/src/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop b/src/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop index ec07ea42f..cbfbf1f5b 100644 --- a/src/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop +++ b/src/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop @@ -27,6 +27,7 @@ Name[sr@latin]=ruby vidžet Name[sv]=Grafisk Ruby-komponent Name[uk]=Віджет на Ruby Name[x-test]=xxRuby Widgetxx +Name[zh_CN]=Ruby 部件 Name[zh_TW]=Ruby 元件 Comment=Native Plasma widget written in Ruby Comment[ar]=ودجة پلازما أصيلة مكتوبة بِروبي diff --git a/tests/testengine/plasma-dataengine-testengine.desktop b/tests/testengine/plasma-dataengine-testengine.desktop index 624d4d8b2..5ba470d61 100644 --- a/tests/testengine/plasma-dataengine-testengine.desktop +++ b/tests/testengine/plasma-dataengine-testengine.desktop @@ -29,6 +29,7 @@ Name[tr]=Test Veri Motoru Name[ug]=سىناققا ئىشلىتىدىغان ماتور Name[uk]=Перевірка рушія даних Name[x-test]=xxTest Data Enginexx +Name[zh_CN]=测试用数据引擎 Name[zh_TW]=測試資料引擎 X-KDE-ServiceTypes=Plasma/DataEngine Type=Service From 9ba599e1b9d66b16a46f2e29b97717d874bc5505 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Thu, 17 Jul 2014 12:30:43 +0200 Subject: [PATCH 2/7] packages with Hidden=true metadata are invalid This originates from the request of downstreams to hide packages that are still installed. why should be easier than not installing them i don't know, *but* semantically I think it makes sense act as if the package was not existing when the metadata says it's hidden REVIEW:119329 --- src/plasma/package.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp index 6ba7a6fce..6acdeea3c 100644 --- a/src/plasma/package.cpp +++ b/src/plasma/package.cpp @@ -78,6 +78,12 @@ bool Package::isValid() const return false; } + //Minimal packages with no metadata *are* supposed to be possible + //so if !metadata().isValid() go ahead + if (metadata().isValid() && metadata().isHidden()) { + return false; + } + if (d->checkedValid) { return d->valid; } From 31c1fcc50e6bd53437062092896dea248e4fccce Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Thu, 17 Jul 2014 17:30:03 +0200 Subject: [PATCH 3/7] Do not leak containment actions REVIEW: 119341 --- src/plasma/containment.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plasma/containment.cpp b/src/plasma/containment.cpp index ff9c1846f..f078c84b1 100644 --- a/src/plasma/containment.cpp +++ b/src/plasma/containment.cpp @@ -90,6 +90,7 @@ Containment::Containment(const QString &packagePath, uint appletId) Containment::~Containment() { + qDeleteAll(d->localActionPlugins); delete d; } From 5e9fc425c62e1bc5ff1cab5b03214ef78f61bf04 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Thu, 17 Jul 2014 18:11:38 +0200 Subject: [PATCH 4/7] Do not leak toolbox items Finally found the cause of the items QML_LEAK_CHECK warns of. BUG:336561 REVIEW: 119343 --- src/scriptengines/qml/plasmoid/containmentinterface.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.cpp b/src/scriptengines/qml/plasmoid/containmentinterface.cpp index 457f898e4..300303da5 100644 --- a/src/scriptengines/qml/plasmoid/containmentinterface.cpp +++ b/src/scriptengines/qml/plasmoid/containmentinterface.cpp @@ -123,6 +123,7 @@ void ContainmentInterface::init() QObject *toolBoxObject = qmlObject()->createObjectFromSource(QUrl::fromLocalFile(pkg.filePath("mainscript")), 0, toolboxProperties); if (toolBoxObject && containmentGraphicObject) { containmentGraphicObject->setProperty("toolBox", QVariant::fromValue(toolBoxObject)); + toolBoxObject->setParent(containmentGraphicObject); } } else { qWarning() << "Could not load toolbox package." << pkg.path(); From c38e6a204e66a2fca2f9f0606475731b5c6bf0d1 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Thu, 17 Jul 2014 20:29:36 +0200 Subject: [PATCH 5/7] Setting parent on toolbox causes problems. Instead delete via connection Reviewed-by: Eike Hein --- src/scriptengines/qml/plasmoid/containmentinterface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.cpp b/src/scriptengines/qml/plasmoid/containmentinterface.cpp index 300303da5..7e046643b 100644 --- a/src/scriptengines/qml/plasmoid/containmentinterface.cpp +++ b/src/scriptengines/qml/plasmoid/containmentinterface.cpp @@ -123,7 +123,7 @@ void ContainmentInterface::init() QObject *toolBoxObject = qmlObject()->createObjectFromSource(QUrl::fromLocalFile(pkg.filePath("mainscript")), 0, toolboxProperties); if (toolBoxObject && containmentGraphicObject) { containmentGraphicObject->setProperty("toolBox", QVariant::fromValue(toolBoxObject)); - toolBoxObject->setParent(containmentGraphicObject); + connect(containmentGraphicObject, &QObject::destroyed, toolBoxObject, &QObject::deleteLater); } } else { qWarning() << "Could not load toolbox package." << pkg.path(); From 1f7951d873ccef9bfa50438cf6ebb367379b2611 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Thu, 17 Jul 2014 21:08:02 +0200 Subject: [PATCH 6/7] Revert "Setting parent on toolbox causes problems. Instead delete via connection" This reverts commit c38e6a204e66a2fca2f9f0606475731b5c6bf0d1. This causes problems on the panel toolbox. We were already trying to set a parent; however as it's a property of a QQuickItem it only changes the visual parent; kdeclarative has a code path that if there's a visual parent to skip the memory management; bug is probably there instead. --- src/scriptengines/qml/plasmoid/containmentinterface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.cpp b/src/scriptengines/qml/plasmoid/containmentinterface.cpp index 7e046643b..300303da5 100644 --- a/src/scriptengines/qml/plasmoid/containmentinterface.cpp +++ b/src/scriptengines/qml/plasmoid/containmentinterface.cpp @@ -123,7 +123,7 @@ void ContainmentInterface::init() QObject *toolBoxObject = qmlObject()->createObjectFromSource(QUrl::fromLocalFile(pkg.filePath("mainscript")), 0, toolboxProperties); if (toolBoxObject && containmentGraphicObject) { containmentGraphicObject->setProperty("toolBox", QVariant::fromValue(toolBoxObject)); - connect(containmentGraphicObject, &QObject::destroyed, toolBoxObject, &QObject::deleteLater); + toolBoxObject->setParent(containmentGraphicObject); } } else { qWarning() << "Could not load toolbox package." << pkg.path(); From a0bd7c9c1493b26b7705204bc0ba8c3fc144e3c4 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Thu, 17 Jul 2014 21:12:16 +0200 Subject: [PATCH 7/7] Revert "Do not leak toolbox items" This reverts commit 5e9fc425c62e1bc5ff1cab5b03214ef78f61bf04. --- src/scriptengines/qml/plasmoid/containmentinterface.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.cpp b/src/scriptengines/qml/plasmoid/containmentinterface.cpp index 300303da5..457f898e4 100644 --- a/src/scriptengines/qml/plasmoid/containmentinterface.cpp +++ b/src/scriptengines/qml/plasmoid/containmentinterface.cpp @@ -123,7 +123,6 @@ void ContainmentInterface::init() QObject *toolBoxObject = qmlObject()->createObjectFromSource(QUrl::fromLocalFile(pkg.filePath("mainscript")), 0, toolboxProperties); if (toolBoxObject && containmentGraphicObject) { containmentGraphicObject->setProperty("toolBox", QVariant::fromValue(toolBoxObject)); - toolBoxObject->setParent(containmentGraphicObject); } } else { qWarning() << "Could not load toolbox package." << pkg.path();