Review Request 129661: optional CHM generation
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/129661/ --- Review request for KDE Frameworks and Olivier Churlaud. Bugs: 373723 https://bugs.kde.org/show_bug.cgi?id=373723 Repository: kapidox Description --- This implements the suggestion detailed in the linked wishlist bug report: optional generation of a compressed help (.chm) file. The patch introduces 2 new kapidox_generate options: --chm : generate a chm file --chmcompiler : path to the chm compiler; `hhc.exec` on MS Windows, or `chmcmd` (from the `Free Pascal` utilities) on *n*x. Currently both options have to be used, there may be an elegant way to combine them. Diffs - src/kapidox/argparserutils.py 7d29c57 src/kapidox/generator.py ff8fcac Diff: https://git.reviewboard.kde.org/r/129661/diff/ Testing --- Works as expected on Mac and Linux File Attachments example chm file; KSyntaxHighlighting 5.28.0 https://git.reviewboard.kde.org/media/uploaded/files/2016/12/16/591489b6-9b71-4076-be1a-64258d80c8c3__SyntaxHighlighting.chm Thanks, René J.V. Bertin
Re: Review Request 129660: Fix set up of the KNSCore::Engine when created with an absolute config file path
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/129660/#review101475 --- Ship it! Ship It! - Dan Leinir Turthra Jensen On Dec. 16, 2016, 4:56 p.m., Aleix Pol Gonzalez wrote: > > --- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/129660/ > --- > > (Updated Dec. 16, 2016, 4:56 p.m.) > > > Review request for KDE Frameworks and Jeremy Whiting. > > > Repository: knewstuff > > > Description > --- > > `QStrandardPaths::locate` returns `{}` when an absolute path is passed so we > can't use it to extract the file's baseName. > Also simplifies a bit the logic that was relying on a class attribute that > was only used in that function and we turned into a local variable. It was > adding a `':'` that doesn't make sense anymore and I dropped as well. > > > Diffs > - > > src/core/engine.h e69dee3 > src/core/engine.cpp a5758f0 > > Diff: https://git.reviewboard.kde.org/r/129660/diff/ > > > Testing > --- > > Tests still pass, doesn't choke anymore on a full path (tested from Discover). > Kate, KDevelop still work (listing of installed resources etc) > > > Thanks, > > Aleix Pol Gonzalez > >
[Differential] [Commented On] D2545: Cleanup KSharedUiServerProxy before qApp exists
thiago added a comment. In https://phabricator.kde.org/D2545#69187, @kfunk wrote: > In https://phabricator.kde.org/D2545#69091, @thiago wrote: > > > There doesn't seem to be a way of doing some clean up before the threads are forcibly killed. > > > > Maybe if I abuse qtmain(). > > > This would only fix it for non-console GUI applications if I understand correctly. That's what we have here, but we'd still keep console applications buggy. There's no way to inject code before ExitProcess() with a plain console application. I was reading the ucrt source code yesterday and it does look like it processes atexit() registrations prior to ExitProcess(). So I'll go for that. There is a side-effect: I have to bring back the patch that makes QtDBus DLL non-unloadable, since otherwise it could crash during exit if had already been unloaded (was loaded by a plugin). BTW, do you know if this problem happens with MinGW? BRANCH master REVISION DETAIL https://phabricator.kde.org/D2545 EMAIL PREFERENCES https://phabricator.kde.org/settings/panel/emailpreferences/ To: kfunk, vonreth, dfaure Cc: thiago, albertvaka, mutlaqja, arrowdodger, #frameworks
Re: Review Request 129660: Fix set up of the KNSCore::Engine when created with an absolute config file path
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/129660/ --- (Updated Dec. 16, 2016, 5:56 p.m.) Review request for KDE Frameworks and Jeremy Whiting. Repository: knewstuff Description --- `QStrandardPaths::locate` returns `{}` when an absolute path is passed so we can't use it to extract the file's baseName. Also simplifies a bit the logic that was relying on a class attribute that was only used in that function and we turned into a local variable. It was adding a `':'` that doesn't make sense anymore and I dropped as well. Diffs - src/core/engine.h e69dee3 src/core/engine.cpp a5758f0 Diff: https://git.reviewboard.kde.org/r/129660/diff/ Testing (updated) --- Tests still pass, doesn't choke anymore on a full path (tested from Discover). Kate, KDevelop still work (listing of installed resources etc) Thanks, Aleix Pol Gonzalez
Re: Review Request 129654: Introduce the resource name in the knsrc file
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/129654/#review101474 --- Waiting for feedback from tsdgeos on the change in scripty. - Aleix Pol Gonzalez On Dec. 15, 2016, 5:05 p.m., Aleix Pol Gonzalez wrote: > > --- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/129654/ > --- > > (Updated Dec. 15, 2016, 5:05 p.m.) > > > Review request for KDE Frameworks and Jeremy Whiting. > > > Repository: knewstuff > > > Description > --- > > Discover has been changed to display all installed `knsrc` files in the > system instead of having a static list in the system. For that to happen I'd > like to include in the `knsrc` file a title that describes the contained > resources. > > This should be accompanied with the following change to scripty to enable > translations of the field: > ``` > Index: findfiles > === > --- findfiles (revision 1477134) > +++ findfiles (working copy) > @@ -28,7 +28,7 @@ > continue >fi >echo "$dir" > - find "$dir" ( -path "*/test/*" -o -path "*/tests/*" -o -path > "*/autotest/*" -o -path "*/autotests/*" ) -prune -o ( ( -name *.directory -o > -name *.desktop -o -name *.desktop.cmake -o -name *.kimap -o -name *.themerc > -o -name *.kcsrc -o -name *.setdlg -o -name index.theme -o -name *.notifyrc > -o -name *.protocol -o -name *.profile -o -name *.actions ) -a ( -type f -o > -type l ) -print ) >> $filelist > + find "$dir" ( -path "*/test/*" -o -path "*/tests/*" -o -path > "*/autotest/*" -o -path "*/autotests/*" ) -prune -o ( ( -name *.directory -o > -name *.desktop -o -name *.knsrc -o -name *.desktop.cmake -o -name *.kimap -o > -name *.themerc -o -name *.kcsrc -o -name *.setdlg -o -name index.theme -o > -name *.notifyrc -o -name *.protocol -o -name *.profile -o -name *.actions ) > -a ( -type f -o -type l ) -print ) >> $filelist >extradesktopscripts=`find $dir -name ExtraDesktop.sh` >initialdir=`pwd` >for extradesktopscript in $extradesktopscripts; do > ``` > > > Diffs > - > > src/downloaddialog.cpp 5831211 > > Diff: https://git.reviewboard.kde.org/r/129654/diff/ > > > Testing > --- > > The `Name` field is used when available, also adopted it in Discover. > > > Thanks, > > Aleix Pol Gonzalez > >
Review Request 129660: Fix set up of the KNSCore::Engine when created with an absolute config file path
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/129660/ --- Review request for KDE Frameworks and Jeremy Whiting. Repository: knewstuff Description --- `QStrandardPaths::locate` returns `{}` when an absolute path is passed so we can't use it to extract the file's baseName. Also simplifies a bit the logic that was relying on a class attribute that was only used in that function and we turned into a local variable. It was adding a `':'` that doesn't make sense anymore and I dropped as well. Diffs - src/core/engine.h e69dee3 src/core/engine.cpp a5758f0 Diff: https://git.reviewboard.kde.org/r/129660/diff/ Testing --- Tests still pass, doesn't choke anymore on a full path (tested from Discover). Thanks, Aleix Pol Gonzalez
Re: Review Request 129654: Introduce the resource name in the knsrc file
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/129654/#review101473 --- Ship it! Ship It! - Dan Leinir Turthra Jensen On Dec. 15, 2016, 4:05 p.m., Aleix Pol Gonzalez wrote: > > --- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/129654/ > --- > > (Updated Dec. 15, 2016, 4:05 p.m.) > > > Review request for KDE Frameworks and Jeremy Whiting. > > > Repository: knewstuff > > > Description > --- > > Discover has been changed to display all installed `knsrc` files in the > system instead of having a static list in the system. For that to happen I'd > like to include in the `knsrc` file a title that describes the contained > resources. > > This should be accompanied with the following change to scripty to enable > translations of the field: > ``` > Index: findfiles > === > --- findfiles (revision 1477134) > +++ findfiles (working copy) > @@ -28,7 +28,7 @@ > continue >fi >echo "$dir" > - find "$dir" ( -path "*/test/*" -o -path "*/tests/*" -o -path > "*/autotest/*" -o -path "*/autotests/*" ) -prune -o ( ( -name *.directory -o > -name *.desktop -o -name *.desktop.cmake -o -name *.kimap -o -name *.themerc > -o -name *.kcsrc -o -name *.setdlg -o -name index.theme -o -name *.notifyrc > -o -name *.protocol -o -name *.profile -o -name *.actions ) -a ( -type f -o > -type l ) -print ) >> $filelist > + find "$dir" ( -path "*/test/*" -o -path "*/tests/*" -o -path > "*/autotest/*" -o -path "*/autotests/*" ) -prune -o ( ( -name *.directory -o > -name *.desktop -o -name *.knsrc -o -name *.desktop.cmake -o -name *.kimap -o > -name *.themerc -o -name *.kcsrc -o -name *.setdlg -o -name index.theme -o > -name *.notifyrc -o -name *.protocol -o -name *.profile -o -name *.actions ) > -a ( -type f -o -type l ) -print ) >> $filelist >extradesktopscripts=`find $dir -name ExtraDesktop.sh` >initialdir=`pwd` >for extradesktopscript in $extradesktopscripts; do > ``` > > > Diffs > - > > src/downloaddialog.cpp 5831211 > > Diff: https://git.reviewboard.kde.org/r/129654/diff/ > > > Testing > --- > > The `Name` field is used when available, also adopted it in Discover. > > > Thanks, > > Aleix Pol Gonzalez > >
Re: Review Request 129658: KConfigDialogManager: cleanup static maps
> On Dec. 16, 2016, 3:55 p.m., Aleix Pol Gonzalez wrote: > > +1 > > Would it be possible to do the same with the signals? Unfortunately that would break compatibility (the maps are public and clients can insert new stuff there) - Elvis --- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/129658/#review101471 --- On Dec. 16, 2016, 3:05 p.m., Elvis Angelaccio wrote: > > --- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/129658/ > --- > > (Updated Dec. 16, 2016, 3:05 p.m.) > > > Review request for KDE Frameworks. > > > Repository: kconfigwidgets > > > Description > --- > > The static maps s_changedMaps() and s_propertyMap() still contain a bunch of > old class names (even from kdelibs3 times!). This patch replaces most of the > hardcoded class names with `QMetaObject::className()`, to ensure compile-time > checks and that we don't use non-kf5 classes. We keep the hardcoded names > only for widgets in frameworks we don't depen on (KCompletion, KTextWidgets, > KIO). > > > Diffs > - > > src/kconfigdialogmanager.h 4660805ed12d97c2f9c87fdd247ed46f96fd4f22 > src/kconfigdialogmanager.cpp 118d502f2290aa25bf07c1c9dad359fc2b163eaa > > Diff: https://git.reviewboard.kde.org/r/129658/diff/ > > > Testing > --- > > Builds, tests pass. > > > Thanks, > > Elvis Angelaccio > >
Re: Review Request 129658: KConfigDialogManager: cleanup static maps
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/129658/#review101471 --- +1 Would it be possible to do the same with the signals? - Aleix Pol Gonzalez On Dec. 16, 2016, 4:05 p.m., Elvis Angelaccio wrote: > > --- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/129658/ > --- > > (Updated Dec. 16, 2016, 4:05 p.m.) > > > Review request for KDE Frameworks. > > > Repository: kconfigwidgets > > > Description > --- > > The static maps s_changedMaps() and s_propertyMap() still contain a bunch of > old class names (even from kdelibs3 times!). This patch replaces most of the > hardcoded class names with `QMetaObject::className()`, to ensure compile-time > checks and that we don't use non-kf5 classes. We keep the hardcoded names > only for widgets in frameworks we don't depen on (KCompletion, KTextWidgets, > KIO). > > > Diffs > - > > src/kconfigdialogmanager.h 4660805ed12d97c2f9c87fdd247ed46f96fd4f22 > src/kconfigdialogmanager.cpp 118d502f2290aa25bf07c1c9dad359fc2b163eaa > > Diff: https://git.reviewboard.kde.org/r/129658/diff/ > > > Testing > --- > > Builds, tests pass. > > > Thanks, > > Elvis Angelaccio > >
Review Request 129658: KConfigDialogManager: cleanup static maps
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/129658/ --- Review request for KDE Frameworks. Repository: kconfigwidgets Description --- The static maps s_changedMaps() and s_propertyMap() still contain a bunch of old class names (even from kdelibs3 times!). This patch replaces most of the hardcoded class names with `QMetaObject::className()`, to ensure compile-time checks and that we don't use non-kf5 classes. We keep the hardcoded names only for widgets in frameworks we don't depen on (KCompletion, KTextWidgets, KIO). Diffs - src/kconfigdialogmanager.h 4660805ed12d97c2f9c87fdd247ed46f96fd4f22 src/kconfigdialogmanager.cpp 118d502f2290aa25bf07c1c9dad359fc2b163eaa Diff: https://git.reviewboard.kde.org/r/129658/diff/ Testing --- Builds, tests pass. Thanks, Elvis Angelaccio
[Differential] [Closed] D3696: Search for the more precise required version of AppstreamQt
This revision was automatically updated to reflect the committed changes. Closed by commit R252:5837de42f3c5: Search for the more precise required version of AppstreamQt (authored by apol). REPOSITORY R252 Framework Integration CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D3696?vs=9057=9081 REVISION DETAIL https://phabricator.kde.org/D3696 AFFECTED FILES CMakeLists.txt EMAIL PREFERENCES https://phabricator.kde.org/settings/panel/emailpreferences/ To: apol, #frameworks, lbeltrame
[Differential] [Commented On] D2075: Fix bug in kfiledialog.cpp that causes crashing when native widgets are used.
kfunk added a comment. In https://phabricator.kde.org/D2075#66751, @jonathans wrote: > Agreed that would be more robust. In writing the patch I was seeking consistency with those functions that already did the test, so those would also need to be updated. Are there any situations where the two tests would yield a different result, ie d->native is true and d->w is non-null? Probably not. But I think it makes more sense to check the pointer you're actually going to dereference in the next statement. Could you update the patch? And also fix the `nullptr` issues? REPOSITORY R239 KDELibs4Support REVISION DETAIL https://phabricator.kde.org/D2075 EMAIL PREFERENCES https://phabricator.kde.org/settings/panel/emailpreferences/ To: jonathans, #frameworks, dfaure, kfunk Cc: kfunk, aacid
[Differential] [Closed] D3702: kconfig_compiler: Use nullptr in generated code
This revision was automatically updated to reflect the committed changes. Closed by commit R237:e6c88f67e2cb: kconfig_compiler: Use nullptr in generated code (authored by kfunk). REPOSITORY R237 KConfig CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D3702?vs=9072=9075 REVISION DETAIL https://phabricator.kde.org/D3702 AFFECTED FILES autotests/kconfig_compiler/test10.cpp.ref autotests/kconfig_compiler/test4.cpp.ref autotests/kconfig_compiler/test5.cpp.ref autotests/kconfig_compiler/test8b.cpp.ref autotests/kconfig_compiler/test_dpointer.cpp.ref autotests/kconfig_compiler/test_signal.cpp.ref src/kconfig_compiler/kconfig_compiler.cpp EMAIL PREFERENCES https://phabricator.kde.org/settings/panel/emailpreferences/ To: kfunk, #frameworks, davidedmundson
[Differential] [Accepted] D3702: kconfig_compiler: Use nullptr in generated code
davidedmundson accepted this revision. davidedmundson added a reviewer: davidedmundson. This revision is now accepted and ready to land. REPOSITORY R237 KConfig BRANCH master REVISION DETAIL https://phabricator.kde.org/D3702 EMAIL PREFERENCES https://phabricator.kde.org/settings/panel/emailpreferences/ To: kfunk, #frameworks, davidedmundson
[Differential] [Updated] D3702: kconfig_compiler: Use nullptr in generated code
kfunk added a reviewer: Frameworks. REPOSITORY R237 KConfig REVISION DETAIL https://phabricator.kde.org/D3702 EMAIL PREFERENCES https://phabricator.kde.org/settings/panel/emailpreferences/ To: kfunk, #frameworks
[Differential] [Commented On] D2545: Cleanup KSharedUiServerProxy before qApp exists
kfunk added a comment. In https://phabricator.kde.org/D2545#69091, @thiago wrote: > There doesn't seem to be a way of doing some clean up before the threads are forcibly killed. > > Maybe if I abuse qtmain(). This would only fix it for non-console GUI applications if I understand correctly. That's what we have here, but we'd still keep console applications buggy. There's no way to inject code before ExitProcess() with a plain console application. BRANCH master REVISION DETAIL https://phabricator.kde.org/D2545 EMAIL PREFERENCES https://phabricator.kde.org/settings/panel/emailpreferences/ To: kfunk, vonreth, dfaure Cc: thiago, albertvaka, mutlaqja, arrowdodger, #frameworks
[Differential] [Commented On] D2545: Cleanup KSharedUiServerProxy before qApp exists
kfunk added a comment. For the record, since I don't see an easy fix I'm pondering about patching qtbase in craft.git: Ideas: a ) Add this to QDBusConnectionManager ctor: qAddPostRoutine([]() { QMetaObject::invokeMethod(QDBusConnectionManager::instance(), "quit"); }); b) Just cherry-pick https://codereview.qt-project.org/#/c/147261/1 (tried to fix the same issue, but got abandoned) This might be killing DBus connections too early, but it's better than hanging the process on exit (I'm being pragmatic here). BRANCH master REVISION DETAIL https://phabricator.kde.org/D2545 EMAIL PREFERENCES https://phabricator.kde.org/settings/panel/emailpreferences/ To: kfunk, vonreth, dfaure Cc: thiago, albertvaka, mutlaqja, arrowdodger, #frameworks
Re: Review Request 129657: Fix assert (in beginRemoveRows) when deselecting an empty child of a selected child in korganizer
> On Dec. 16, 2016, 2:55 a.m., Stephen Kelly wrote: > > Thanks for working on this! > > > > I noticed that I could remove the change in beginRemoveRows without any > > unit test failing. > > > > Please add this test on top of your patch: > > > > diff --git a/autotests/kselectionproxymodeltest.cpp > > b/autotests/kselectionproxymodeltest.cpp > > index e17fa53..68c8678 100644 > > --- a/autotests/kselectionproxymodeltest.cpp > > +++ b/autotests/kselectionproxymodeltest.cpp > > @@ -611,6 +611,13 @@ void KSelectionProxyModelTest::removeRows_data() > ><< 1 > ><< QStringList{"9", "9"} << 2; > >++testNumber; > > + > > + QTest::newRow(QByteArray("test" + > > QByteArray::number(testNumber)).data()) > > + << static_cast(kspm_mode) << > > connectSelectionModelFirst << false > > + << QStringList{"6", "8", "11"} << 4 > > + << 0 > > + << QStringList{"8", "8"} << 4; > > + ++testNumber; > >} > >} Thanks for the unittest! I did notice that I was missing one, the fix in beginRemoveRows being just "by analogy". Now it's perfect ;) - David --- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/129657/#review101464 --- On Dec. 16, 2016, 9:23 a.m., David Faure wrote: > > --- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/129657/ > --- > > (Updated Dec. 16, 2016, 9:23 a.m.) > > > Review request for KDE Frameworks and Stephen Kelly. > > > Repository: kitemmodels > > > Description > --- > > After >int proxyEndRemove = proxyStartRemove; >proxyEndRemove += rc; was adding 0 (empty root) > and then --proxyEndRemove; was making us end up with proxyEndRemove < > proxyStartRemove. > > > Diffs > - > > autotests/kselectionproxymodeltest.cpp > 483e7c42dabab6aa560622ff0418ee7f90363e15 > src/kselectionproxymodel.cpp 0f57c70f05d4cbde9b14f4257bff1365ef5443f6 > > Diff: https://git.reviewboard.kde.org/r/129657/diff/ > > > Testing > --- > > New unittest + unchecking calendar in korganizer no longer asserts. > > > Thanks, > > David Faure > >
Re: Review Request 129657: Fix assert (in beginRemoveRows) when deselecting an empty child of a selected child in korganizer
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/129657/ --- (Updated Dec. 16, 2016, 9:23 a.m.) Status -- This change has been marked as submitted. Review request for KDE Frameworks and Stephen Kelly. Changes --- Submitted with commit 24db696bab2d07388fe124244ce5226f787fd79e by David Faure to branch master. Repository: kitemmodels Description --- After int proxyEndRemove = proxyStartRemove; proxyEndRemove += rc; was adding 0 (empty root) and then --proxyEndRemove; was making us end up with proxyEndRemove < proxyStartRemove. Diffs - autotests/kselectionproxymodeltest.cpp 483e7c42dabab6aa560622ff0418ee7f90363e15 src/kselectionproxymodel.cpp 0f57c70f05d4cbde9b14f4257bff1365ef5443f6 Diff: https://git.reviewboard.kde.org/r/129657/diff/ Testing --- New unittest + unchecking calendar in korganizer no longer asserts. Thanks, David Faure
Re: Jenkins-kde-ci: frameworkintegration master stable-kf5-qt5 » Linux,gcc - Build # 334 - Still Failing!
On Fri, Dec 16, 2016 at 3:46 AM, Aleix Polwrote: > On Thu, Dec 15, 2016 at 7:19 AM, Ben Cooksley wrote: >> >> On Thu, Dec 15, 2016 at 7:16 PM, wrote: >> > >> > GENERAL INFO >> > >> > BUILD FAILURE >> > Build URL: >> > https://build.kde.org/job/frameworkintegration%20master%20stable-kf5-qt5/PLATFORM=Linux,compiler=gcc/334/ >> > Project: PLATFORM=Linux,compiler=gcc >> > Date of build: Thu, 15 Dec 2016 06:14:40 + >> > Build duration: 23 sec >> >> It would appear that Commit d5652726b30c14033cddd757242db703576b1e95 >> introduced a dependency on KNewStuff, but this dependency has not been >> declared in the build metadata... >> >> > >> > CHANGE SET >> > No changes >> >> Cheers, >> Ben > > > Should be fixed: > https://commits.kde.org/kde-build-metadata/a322bb20d90c05e610443d774bc9634e6f2ab7ef Many thanks. > > Aleix Cheers, Ben