Clean up last messy commit; Fix Qt 4 compatibility
10 files changed