Not sure if this is the best spot to report it, but Neon dev/stable kdepim packages are currently broken because of this - I guess someone needs to trigger a rebuild/version bump of packages depending on kcalcore?

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

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...

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

Solves the problem in https://bugs.kde.org/show_bug.cgi?id=387005 for me. KDevelop properly understands Qt code now, irrespective of the selected compiler (tested gcc, clang-3.8, clang-5.0).

Not sure if this is the right place to discuss, but this breaks the generic project manager for me.

Fixed issue with m_projectPlugins. Sorry, I did not test far enough. Thank you @kossebau for catching that even without testing ;-)

see also: https://bugs.kde.org/show_bug.cgi?id=387005

I think this may prevent KDevGenericManager from being selectable at all. Later in OpenProjectDialog::validateOpenUrl() we check for empty filters to add plugins that do not need a specific file: