diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2013-01-11 09:11:11 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-11 10:05:52 +0100 |
| commit | baaeee4d711bd2a8ef5d4472ede6f33534f73e30 (patch) | |
| tree | 7ed94ad8d6cb9134d5e84c8478e08dbe4b9ca7f8 | |
| parent | 7cc1af6542c960c17ccfef02de943a35edcbb5df (diff) | |
| download | qttools-baaeee4d711bd2a8ef5d4472ede6f33534f73e30.tar.gz | |
Fix the missing webview Qt Designer plugin.
Task-number: QTBUG-29031
Change-Id: Ie91ec524292358388586827acbd69ec2fed44072
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| -rw-r--r-- | src/designer/src/plugins/plugins.pro | 3 | ||||
| -rw-r--r-- | src/designer/src/src.pro | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro index 44f5e34e9..7cd16f2da 100644 --- 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 9802c653d..64d1c3708 100644 --- 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 |