SVN commit 956619 by fischer: Sync with trunk and branch to reduce the difference. M +38 -5 enumliteral.cpp M +3 -39 enumliteral.h M +113 -11 folder.cpp M +5 -113 folder.h M +130 -8 foreignkeyconstraint.cpp M +22 -142 foreignkeyconstraint.h M +41 -0 icon_utils.cpp M +2 -45 icon_utils.h M +1 -1 main.cpp