summaryrefslogtreecommitdiffstats
path: root/tools/designer/src
diff options
context:
space:
mode:
authorRay Donnelly <mingw.android@laptop.com>2011-08-22 16:21:36 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-08-22 16:52:23 (GMT)
commit0c70be512bfc40e8a2a09f60a66b7ecb114e748e (patch)
tree86de6b8e7eacc1b123dc135be3a68c046cd1704b /tools/designer/src
parentdb86c9f57bb6b26d92b0281ac3ca39e1fcbea715 (diff)
downloadQt-0c70be512bfc40e8a2a09f60a66b7ecb114e748e.zip
Qt-0c70be512bfc40e8a2a09f60a66b7ecb114e748e.tar.gz
Qt-0c70be512bfc40e8a2a09f60a66b7ecb114e748e.tar.bz2
Disable activeqt on win32-g++ (it doesn't build).
Merge-request: 1336 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'tools/designer/src')
-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 bcebb82..64763a9 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: SUBDIRS += activeqt
+win32:!win32-g++*: SUBDIRS += activeqt
# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d
contains(QT_CONFIG, webkit): SUBDIRS += qwebview
contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets