summaryrefslogtreecommitdiffstats
path: root/tools/designer
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2012-01-11 12:54:15 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-01-17 01:54:14 (GMT)
commit330ca76b021d35421a227bd6eaca95653e58bb01 (patch)
tree5dadab93ba9ee5383a50f1ef6117f9237c5a43e5 /tools/designer
parentbb5cba5dcc3f3453ccbfea2667adc3a12c4ba92b (diff)
downloadQt-330ca76b021d35421a227bd6eaca95653e58bb01.zip
Qt-330ca76b021d35421a227bd6eaca95653e58bb01.tar.gz
Qt-330ca76b021d35421a227bd6eaca95653e58bb01.tar.bz2
Revert "Disable activeqt on win32-g++ (it doesn't build)."
the change is bogus; people were actually building it successfully. This reverts commit 0c70be512bfc40e8a2a09f60a66b7ecb114e748e Change-Id: I641fac34b78d6c23ead143d34a8ae15bf191cae3 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Ray Donnelly <mingw.android@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'tools/designer')
-rw-r--r--tools/designer/src/plugins/plugins.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/designer/src/plugins/plugins.pro b/tools/designer/src/plugins/plugins.pro
index 64763a9..bcebb82 100644
--- a/tools/designer/src/plugins/plugins.pro
+++ b/tools/designer/src/plugins/plugins.pro
@@ -3,7 +3,7 @@ CONFIG += ordered
REQUIRES = !CONFIG(static,shared|static)
contains(QT_CONFIG, qt3support): SUBDIRS += widgets
-win32:!win32-g++*: SUBDIRS += activeqt
+win32: SUBDIRS += activeqt
# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d
contains(QT_CONFIG, webkit): SUBDIRS += qwebview
contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets