Fixed compilation and integration issues with Qt Creator 2.8.1 (Qt
4.8.4).
Merge pull request #2 from dalemarchand/master

Fixed compilation and integration issues with Qt Creator 2.8.1