CI Fix macdeployqt AFTER it runs

.. LOL

.travis.yml

@@ -1,6 +1,6 @@
 branches:
 - master
-##osx_image: xcode7 #or xcode6.4 or xcode7.1
+osx_image: xcode7.2b1 # will also get OSX El Capitan
 language:
 - objective-c
 compiler:
@@ -21,7 +21,8 @@ env:
 before_install:
 - date
 - brew update
-- sh travis/install-qt.sh
+##- sh travis/install-qt.sh
+- brew install $QT
 - brew install libical
 - brew install libusb libusb-compat
 - brew install srmio
@@ -95,15 +96,11 @@ script:
 - CC=clang CXX=clang++ make -j4 sub-src
 after_success:
 - cd src
-#fix for libcocoa.dylib issue with qt5.4.2
-#not much of a fix, but will checkout macdeployqtfix shortly...
-##- mkdir -p GoldenCheetah.app/Contents/MacOS/platforms
-##- cp /usr/local/opt/$QT_PATH/plugins/platforms/libqcocoa.dylib GoldenCheetah.app/Contents/MacOS/platforms/
-## fix up the bundle with macdeployqtfix
-- python ../travis/macdeployqtfix.py GoldenCheetah.app /usr/local/opt/$QT_PATH
 - ls -laR GoldenCheetah.app
 - sh ../travis/check-gc.sh
 - /usr/local/opt/$QT_PATH/bin/macdeployqt GoldenCheetah.app -verbose=2 -dmg
+## fix up the bundle with macdeployqtfix
+- python ../travis/macdeployqtfix.py GoldenCheetah.app /usr/local/opt/$QT_PATH
 - brew remove $QT
 - mv GoldenCheetah.dmg GoldenCheetah_$QT.dmg
 - hdiutil mount GoldenCheetah_$QT.dmg

src/main.cpp

@@ -16,23 +16,25 @@
  * Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "Context.h"
+#include "Athlete.h"
+#include "MainWindow.h"
+#include "Settings.h"
+#include "TrainDB.h"
+#include "Colors.h"
+#include "GcUpgrade.h"
+
 #include <QApplication>
 #include <QtGui>
 #include <QFile>
 #include <QWebSettings>
 #include <QMessageBox>
 #include "ChooseCyclistDialog.h"
-#include "MainWindow.h"
-#include "Settings.h"
-#include "TrainDB.h"
-#include "Colors.h"
 #ifdef GC_WANT_HTTP
 #include "httplistener.h"
 #include "httprequesthandler.h"
 #endif
 
-#include "GcUpgrade.h"
-
 #include <signal.h>
 
 // redirect errors to `home'/goldencheetah.log