Bug 733951 - Qt port does not compile anymore due to bad includes order. r=jrmuizel

--HG--
extra : rebase_source : 7f26da25e0fd3ec15c8c167eae017fe493c31ae7

gfx/gl/GLContextProviderEGL.cpp

@@ -39,11 +39,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "mozilla/Preferences.h"
 #include "mozilla/Util.h"
-
-#include "nsIScreen.h"
-#include "nsIScreenManager.h"
+// please add new includes below Qt, otherwise it break Qt build due malloc wrapper conflicts
 
 #if defined(XP_UNIX)
 
@@ -92,7 +89,6 @@ typedef void *EGLNativeWindowType;
 
 #elif defined(XP_WIN)
 
-#include "mozilla/Preferences.h"
 #include "nsILocalFile.h"
 
 #ifndef WIN32_LEAN_AND_MEAN
@@ -151,6 +147,9 @@ public:
 
 #endif
 
+#include "mozilla/Preferences.h"
+#include "nsIScreen.h"
+#include "nsIScreenManager.h"
 #include "gfxUtils.h"
 #include "gfxFailure.h"
 #include "gfxASurface.h"