shell: Display generic project managers again

Authored by mschwarz on Apr 18 2018, 12:53 PM.

Description

shell: Display generic project managers again

Summary:
This fixes a regression in 3a74e103e03a which prevents empty filter lines
in the file dialog, but also removes plugins with empty filters from
the list of project managers.

This commit adds a second list for generic project managers to avoid
storing these in the project filters list.

Test Plan: Launch KDevelop, open the Import / Open Project dialog, select an empty folder, and click next. The Generic Project Manager should be shown in the dropbox.

Reviewers: KDevelop, mwolff, kossebau

Reviewed By: KDevelop, mwolff, kossebau

Subscribers: kfunk, brauch, mwolff, kossebau, kdevelop-devel

Differential Revision: https://phabricator.kde.org/D12279

Details

Committed
kfunkApr 18 2018, 12:54 PM
Reviewer
KDevelop
Differential Revision
D12279: shell: Display generic project managers again
Parents
R32:a325f79f72e4: release-scripts: create_log: More refactoring
Branches
Unknown
Tags
Unknown
apol added a subscriber: apol.Apr 26 2018, 5:49 PM

It doesn't seem to be working here, I just merged 5.2 to master and it's still broken for me.

mschwarz added a subscriber: kfunk.May 2 2018, 8:22 PM

That's because something very weird happened on the merge.

On the 5.2 branch everything is fine, but on master the changes from ab2fcd3b27890dfdc0b33f9eb31163e62bdd34e9 are simply not applied. git log master shows the commit, though.

It gets better: git log kdevplatform/shell/openprojectdialog.cpp does not show the commit.
git log --full-history kdevplatform/shell/openprojectdialog.cpp shows it.

Any git wizards around? @kfunk

git show -m 967f42fd37bf0f8c5e23cfd8522b856098e65952 shows that kdevplatform/shell/openprojectdialog.cpp was reset to the master state during the merge - did you have a merge conflict? I'm quite confused why the merge conflict does not show up in the merge commit without -m, though...

@kfunk @mwolff @kossebau Can somebody with commit rights fix the merge?
git cherry-pick ab2fcd3b2789
on master should do the job.

kfunk added a comment.May 8 2018, 3:58 AM

Thanks for noticing, Max!