diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-05-15 11:11:55 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-15 06:32:09 +0200 |
| commit | a771e738064396718b7be0295789a9c9e62b60b4 (patch) | |
| tree | f4bb42620d84bcc41cf17423cea4aaaf0709ea06 /tools | |
| parent | 9c0ea2c3e77ee2c101a7d3351455f87cda0d8f21 (diff) | |
Eliminated usage of "declarative" compat module.
The check in qmltooling attempts to avoid installing the qtquick1
version of the debugger plugin if qtquick2 is used. The removal of the
declarative module meant that this plugin was always enabled,
potentially overwriting the qtquick2 debugger plugin. This check was
updated to work again, although this approach is still somewhat
problematic. It would be better if the different versions of the
plugins had different names.
The check in tools/designer/src/plugins doesn't seem to make sense, so
it was removed.
Change-Id: I55d1bf59264d3c5d62c2d4545e9ced952e460efb
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'tools')
| -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 b9a497cf..f08a74e5 100644 --- a/tools/designer/src/plugins/plugins.pro +++ b/tools/designer/src/plugins/plugins.pro @@ -2,4 +2,4 @@ TEMPLATE = subdirs CONFIG += ordered REQUIRES = !CONFIG(static,shared|static) -contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativeview +SUBDIRS += qdeclarativeview |