diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-01 09:56:19 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-03-01 10:05:21 +0100 |
| commit | 91d1fc42d37501555fea3674b93f5fd81401b518 (patch) | |
| tree | 5c9150606db89a00989d7a3450c287efbeb1b7cd /src/imports/controls/controls.pro | |
| parent | 8b5490c3acb2731cc5bf7b968128138d96259939 (diff) | |
| parent | a19ab6806043591abf94868de6962a3747284da7 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Ia4c692552e6573b33b2e0f6b43b2a482a78ad970
Diffstat (limited to 'src/imports/controls/controls.pro')
| -rw-r--r-- | src/imports/controls/controls.pro | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro index 6ca2cf69..309f103c 100644 --- a/src/imports/controls/controls.pro +++ b/src/imports/controls/controls.pro @@ -17,7 +17,7 @@ RESOURCES += \ $$PWD/qtquickcontrols2plugin.qrc include(controls.pri) -!static: include(designer/designer.pri) +!static: qtConfig(quick-designer): include(designer/designer.pri) include(doc/doc.pri) qtquickcompiler { @@ -28,3 +28,5 @@ qtquickcompiler { CONFIG += no_cxx_module load(qml_plugin) + +requires(qtConfig(quickcontrols2-default)) |