SVN commit 956618 by fischer: Sync with trunk and branch to reduce the difference. M +22 -5 enumliteral.cpp M +3 -24 enumliteral.h M +20 -21 folder.cpp M +5 -14 folder.h M +130 -8 foreignkeyconstraint.cpp M +24 -77 foreignkeyconstraint.h M +2 -3 icon_utils.h M +0 -2 kplayerslideraction.cpp