From dd82932ab27537d0e1eb22d47030fef9047d832a Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 4 Jun 2013 09:26:50 +0200 Subject: Re-enable compilation of idc for MinGW Re-enable compilation of idc for MinGW to fulfill the activeqt dependency on idc. idc and activeqt compile fine with MinGW, but most examples won't work because of the missing midl compiler. This was the reason activeqt and idc was disabled originally after Qt 4.8.4. Anyhow, 330ca76b then re-enabled compilation for activeqt, but not idc, which broke the build. This patch re-enables compilation of idc, but still by default does not compile activeqt examples. Qt 5 ships with activeqt / idc for MinGW too, btw, so excluding it in Qt 4.8.5 is inconsistent. Task-number: QTBUG-31517 Change-Id: I7d4e7ed56c1954996b7291f56143ff83fcdcb0a5 Reviewed-by: Oswald Buddenhagen --- src/tools/tools.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/tools.pro b/src/tools/tools.pro index 32b920c..4736d09 100644 --- a/src/tools/tools.pro +++ b/src/tools/tools.pro @@ -4,7 +4,7 @@ TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc !contains(QT_CONFIG, no-gui): TOOLS_SUBDIRS += src_tools_uic !cross_compile { contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3 - win32:!wince*:!win32-g++*: SRC_SUBDIRS += src_tools_idc + win32:!wince*: SRC_SUBDIRS += src_tools_idc } # Set subdir and respective target name -- cgit v0.12