Mac OSX SDK10.4 CALayer.h 'slots' variable

The Cocoa header defines an array called 'slots'
that conflicts with the QT macro (which replaces it
with whitespace).

Re-ordered header includes to avoid the macro clash when
compiling on SDK10.4 or earlier.

src/QtMacVideoWindow.mm

@@ -16,14 +16,16 @@
 * Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "QtMacVideoWindow.h"
-
 //avoid including these in the main headers since all the
 //Objective-C syntax borks the Qt Meta Compiler (moc)
+//we also include them before the QT headers to avoid conflicts
+//between QT keywords 'slots' and a header definition in CALayer.h
 #include <QTKit/QTKit.h>
 #include <QTkit/QTMovie.h>
 #include <QTkit/QTMovieView.h>
 
+#include "QtMacVideoWindow.h"
+
 VideoWindow::VideoWindow(MainWindow *parent, const QDir &home)  :
 GcWindow(parent), home(home), main(parent), hasMovie(false)
 {