Merge pull request #1682 from ZappoMan/master

Fix Windows Build

CMakeLists.txt

@@ -31,11 +31,11 @@ ENDIF(APPLE)
 # targets not supported on windows
 if (NOT WIN32)
 add_subdirectory(animation-server)
+add_subdirectory(data-server)
 endif (NOT WIN32)
 
 # targets on all platforms
 add_subdirectory(assignment-client)
-add_subdirectory(data-server)
 add_subdirectory(domain-server)
 add_subdirectory(interface)
 add_subdirectory(pairing-server)

interface/src/ui/UpdateDialog.cpp

@@ -6,9 +6,8 @@
 //  Copyright (c) 2013, 2014 High Fidelity, Inc. All rights reserved.
 //
 
+#include "Application.h"  // HACK ATTACK WARNING: for windows build to work, we need this ahead of QtGui
 #include <QtGui>
-
-#include "Application.h"
 #include "ui_updateDialog.h"
 
 #include "UpdateDialog.h"