From 03e507c8f3816053257b3c351d79c494b6f9174d Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Mon, 6 Mar 2017 13:01:42 +0100
Subject: Fix include order

We need to include qimageiohandler.h if we want to be sure that we can
use it. Also, QT_NO_IMAGEFORMATPLUGIN is defined in a header and needs
to be checked after the includes.

Change-Id: Ic6c376c87abb9684f45ca3d740deb7e580220ae4
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
---
 src/plugins/imageformats/icns/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/imageformats/icns/main.cpp b/src/plugins/imageformats/icns/main.cpp
index d25d884..70dd034 100644
--- a/src/plugins/imageformats/icns/main.cpp
+++ b/src/plugins/imageformats/icns/main.cpp
@@ -38,10 +38,10 @@
 **
 ****************************************************************************/
 
-#ifndef QT_NO_IMAGEFORMATPLUGIN
-
+#include <QtGui/qimageiohandler.h>
 #include "qicnshandler_p.h"
 
+#ifndef QT_NO_IMAGEFORMATPLUGIN
 #ifndef QT_NO_DATASTREAM
 
 QT_BEGIN_NAMESPACE
-- 
cgit v1.2.3