diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2013-06-04 07:26:50 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-04 15:56:03 (GMT) |
| commit | dd82932ab27537d0e1eb22d47030fef9047d832a (patch) | |
| tree | 539d7d9c12569282c2dd48ffe1ff1ab2da2a7ec7 | |
| parent | 1a74ccd82caf0fb36ff163070c9a3de0e61999d9 (diff) | |
| download | Qt-dd82932ab27537d0e1eb22d47030fef9047d832a.zip Qt-dd82932ab27537d0e1eb22d47030fef9047d832a.tar.gz Qt-dd82932ab27537d0e1eb22d47030fef9047d832a.tar.bz2 | |
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 <oswald.buddenhagen@digia.com>
| -rw-r--r-- | src/tools/tools.pro | 2 |
1 files changed, 1 insertions, 1 deletions
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 |