summaryrefslogtreecommitdiffstats
path: root/tools/designer/src/plugins
diff options
context:
space:
mode:
authoraavit <qt-info@nokia.com>2011-09-10 14:43:04 (GMT)
committeraavit <qt-info@nokia.com>2011-09-10 14:43:04 (GMT)
commitb318fc0800c3081af16a38614b95dd50a82b6bbb (patch)
tree9057e35b5d03ce2b223167b5bc98af681fcb0065 /tools/designer/src/plugins
parente78edf97db002d5d8efcfd0c2df283f980d3a432 (diff)
parent2fafbf51d6cd61d073c9f77dffd71864e9686de6 (diff)
downloadQt-b318fc0800c3081af16a38614b95dd50a82b6bbb.zip
Qt-b318fc0800c3081af16a38614b95dd50a82b6bbb.tar.gz
Qt-b318fc0800c3081af16a38614b95dd50a82b6bbb.tar.bz2
Merge remote-tracking branch 'qt-fire-review/master'
Diffstat (limited to 'tools/designer/src/plugins')
-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