summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2017-03-06 13:01:42 +0100
committerUlf Hermann <ulf.hermann@qt.io>2017-03-06 12:27:59 +0000
commit03e507c8f3816053257b3c351d79c494b6f9174d (patch)
tree8c0ad1ecd804d3da874e5d3afce77af8db3ce1e3
parent8f045f413e935ef9e7fdcef55c52343686a0f1aa (diff)
Fix include order5.8
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>
-rw-r--r--src/plugins/imageformats/icns/main.cpp4
1 files 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