diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-08 00:18:25 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-08 00:18:25 (GMT) |
| commit | 7c555955e96bc188bfebdea2cd066d871f151b59 (patch) | |
| tree | 71e8765fa2f82878cbb2b5505857bd5f09595228 /tools/designer/src | |
| parent | 7b78eab2c04ed0388a2ffdf43bbe5ca37ccc8167 (diff) | |
| parent | 558acd8c8ff94c6fd1e96514a2dffb587a66bb2f (diff) | |
| download | Qt-7c555955e96bc188bfebdea2cd066d871f151b59.zip Qt-7c555955e96bc188bfebdea2cd066d871f151b59.tar.gz Qt-7c555955e96bc188bfebdea2cd066d871f151b59.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'tools/designer/src')
| -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 cf4fa8a..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:!contains(QT_EDITION, OpenSource):SUBDIRS += activeqt +win32: SUBDIRS += activeqt # contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d contains(QT_CONFIG, webkit): SUBDIRS += qwebview contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets |