[dolphin] /: Merge branch 'Applications/15.08'

[Christoph Feck]

On Friday 21 August 2015 12:13:09 Harald Sitter wrote:
> Git commit dc7b83169d4ed55d402de71b38b6cd8d1e2fda8d by Harald
> Sitter. Committed on 21/08/2015 at 10:12.
> Pushed by sitter into branch 'master'.
> 
> Merge branch 'Applications/15.08'
> 
> Conflicts:
> 	CMakeLists.txt
> 
> M  +5    -1    CMakeLists.txt
> 
> 
http://commits.kde.org/dolphin/dc7b83169d4ed55d402de71b38b6cd8d1e2f
> da8d

Since this merge, I get the following compilation error when compiling 
master branch:

/local/git/KDE/applications/dolphin/src/main.cpp:22:29: fatal error: 
dolphin_version.h: No such file or directory
 #include "dolphin_version.h"
                             ^
compilation terminated.
make[2]: *** [src/CMakeFiles/kdeinit_dolphin.dir/main.cpp.o] Error 1
make[2]: Target `src/CMakeFiles/kdeinit_dolphin.dir/build' not remade 
because of errors.
make[1]: *** [src/CMakeFiles/kdeinit_dolphin.dir/all] Error 2
make[1]: Target `all' not remade because of errors.
make: *** [all] Error 2
make: Target `default_target' not remade because of errors.
-- Failed: dolphin