diff options
| author | aavit <qt-info@nokia.com> | 2011-09-08 19:42:31 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-09-08 19:42:31 (GMT) |
| commit | a2c2c71ecd84e90f72697dfd57544c8d506c78e2 (patch) | |
| tree | c5e31ff16e2471d33a124a6a37f4e48acdacd235 /tools/designer/src/plugins/plugins.pro | |
| parent | 6326227674efa85c1a5320141041110d211efc75 (diff) | |
| parent | 260005374b9b930aa583cd117aba96f8f4b34131 (diff) | |
| download | Qt-a2c2c71ecd84e90f72697dfd57544c8d506c78e2.zip Qt-a2c2c71ecd84e90f72697dfd57544c8d506c78e2.tar.gz Qt-a2c2c71ecd84e90f72697dfd57544c8d506c78e2.tar.bz2 | |
Merge remote-tracking branch 'qt-mainline/4.8'
Conflicts:
tools/qvfb/qvfbshmem.cpp
Diffstat (limited to 'tools/designer/src/plugins/plugins.pro')
| -rw-r--r-- | tools/designer/src/plugins/plugins.pro | 2 |
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 |