Merge branch '5.1'

Authored by kossebau on Apr 28 2017, 12:58 PM.

Description

Merge branch '5.1'

  1. Conflicts:
  2. analyzers/cppcheck/CMakeLists.txt
  3. languages/clang/kdevclangsupport.json

Details

Committed
kossebauApr 28 2017, 12:58 PM
Parents
R32:dcf0c6e6a4ff: Look for Cppcheck as RUNTIME dependencies
R32:6ec8acbc47bc: Fix build with Qt 5.6
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
dcf0c6e6a4ffD5632kossebau
Look for Cppcheck as RUNTIME dependencies 
Apr 28 2017
d27fd44324e6D5485aaronpuchert/kfunk
The OpenCL language is actually called OpenCL C 
Apr 28 2017
171f6e6b989dD5624kossebau
Remove unneeded mimetype for *.kdevinternal files 
Apr 27 2017