Merge remote-tracking branch 'origin/5.0'

Authored by kfunk on Jun 25 2016, 8:04 AM.

Description

Merge remote-tracking branch 'origin/5.0'

Merged Changes

CommitAuthorDetailsCommitted
f59f2973b31drjvbb/kfunk
add Kate modeline to makefileresolver.{cpp,h} which use a tabwidth of 2 
Jun 25 2016
36e3d7ab2235rjvbb/kfunk
recognise #import directive in the context browser Hovering the cursor over an… 
Jun 25 2016
4f0f31a1c83cbrauch
Revert "Restore system environment for subprocesses" 
Jun 22 2016
459eb5bc842aD1969apol
Specify the currentText in the fixits 
Jun 22 2016
8ecc21c7f753apol
Fix test 
Jun 18 2016
00fcfb04bac3apol
tweak debug info for readability 
Jun 18 2016
5e61ba1e8985kfunk
Remove trigger-happy assert 
Jun 18 2016
0ac761ce294bDenis Steckelmacher/kfunk
qmljs: Don't hold locks while performing filesystem accesses or calling… 
Jun 18 2016
09fdd0d1fbbakfunk
Update urlinfo.h to fix string parsing 
Jun 18 2016
72a16786b787D1926kfunk
Make QtSingleApplication actually work 
Jun 17 2016
f8d4c064dc4bkfunk
Import urlinfo.h from kate 
Jun 17 2016