summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorTasuku Suzuki <stasuku@gmail.com>2012-12-05 10:11:54 +0900
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-05 15:30:07 +0100
commit6a98976791b74dd98afa44c4643d26747f99039e (patch)
tree8c9658d639b74817804b9476413e57cd792fa9c5 /src/corelib/global
parent21e8ef1fefa5f8f2e93da89510627373a8ccdd16 (diff)
Make qtbase compile with QT_NO_IMAGEFORMATPLUGINv5.0.0-rc1
Change-Id: I1fef96481fa902cfd9de63fa814f70412eee4d15 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: aavit <eirik.aavitsland@digia.com>
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qfeatures.h3
-rw-r--r--src/corelib/global/qfeatures.txt2
2 files changed, 1 insertions, 4 deletions
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
index d2c1095a4f..a63d3a3b3d 100644
--- a/src/corelib/global/qfeatures.h
+++ b/src/corelib/global/qfeatures.h
@@ -91,9 +91,6 @@
// QHostInfo
//#define QT_NO_HOSTINFO
-// QImageIOPlugin
-//#define QT_NO_IMAGEFORMATPLUGIN
-
// BMP Image Format
//#define QT_NO_IMAGEFORMAT_BMP
diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt
index d627f38a70..ad1ca5a6d5 100644
--- a/src/corelib/global/qfeatures.txt
+++ b/src/corelib/global/qfeatures.txt
@@ -760,7 +760,7 @@ SeeAlso: ???
Feature: IMAGEFORMATPLUGIN
Description: Supports writing an image format plugin.
Section: Images
-Requires:
+Requires: LIBRARY
Name: QImageIOPlugin
SeeAlso: ???