Merge remote-tracking branch 'origin/5.0'

Authored by arichardson on Mar 8 2016, 12:53 PM.

Description

Merge remote-tracking branch 'origin/5.0'

  • origin/5.0: Constify some methods of OpenProjectDialog. Ask user if he wants to override the existing project when he imports a new project from the build system file and there is already.kdev file for it. remove extra ';' Mark some Clang warnings as errors WelcomePage: Use OpacityAnimator properly Minor: Fix variable names

Details

Committed
arichardsonMar 8 2016, 12:53 PM
Parents
R33:9aff122abb72: Constify some methods of OpenProjectDialog.
R33:88e624ca585d: fixuifiles
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
9aff122abb72arrowd
Constify some methods of OpenProjectDialog. 
Mar 8 2016
a2836fb12d54D893arrowd
Ask user if he wants to override the existing project when he imports a new… 
Mar 8 2016
98c7f78a10e3Pino Toscano
remove extra ';' 
Mar 6 2016
91c1fa525012kfunk
Mark some Clang warnings as errors 
Mar 4 2016
b5b3618724e7kfunk
WelcomePage: Use OpacityAnimator properly 
Mar 4 2016
fce350a637f5kfunk
Minor: Fix variable names 
Mar 4 2016