Fix the missing webview Qt Designer plugin.

Task-number: QTBUG-29031

Change-Id: Ie91ec524292358388586827acbd69ec2fed44072
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro
index 44f5e34..7cd16f2 100644 (file)
--- a/src/designer/src/plugins/plugins.pro
+++ b/src/designer/src/plugins/plugins.pro
@@ -1,7 +1,6 @@
 TEMPLATE = subdirs
 CONFIG += ordered
 
-REQUIRES = !CONFIG(static,shared|static)
 # qtHaveModule(opengl): SUBDIRS += tools/view3d
 qtHaveModule(webkitwidgets): SUBDIRS += qwebview
-# win32: contains(QT_CONFIG, activeqt): SUBDIRS += activeqt
+# win32: qtHaveModule(activeqt): SUBDIRS += activeqt

diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
index 9802c65..64d1c37 100644 (file)
--- a/src/designer/src/src.pro
+++ b/src/designer/src/src.pro
@@ -7,4 +7,4 @@ SUBDIRS = \
     components \
     designer
 
-CONFIG(shared,shared|static):SUBDIRS += plugins
+contains(QT_CONFIG, shared): SUBDIRS += plugins