diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-25 20:00:56 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-25 20:00:56 +0100 |
| commit | ee6c83db18e65e4eec7b7280213b780576b24c03 (patch) | |
| tree | caf049a79f3187962059c7f73181b22b71dc1632 /src/imports/controls/controls.pro | |
| parent | 718f6def0b2c4d84bdc8ebdc9633697885747feb (diff) | |
| parent | db5780507733ef803e963dcef0b5260c4b94acfa (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/templates/qquickrangeslider_p.h
Change-Id: Ibe8ec18a7e22080f69f316d0394af1d03517ce93
Diffstat (limited to 'src/imports/controls/controls.pro')
| -rw-r--r-- | src/imports/controls/controls.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro index 0ccdf5a0..9a3f9628 100644 --- a/src/imports/controls/controls.pro +++ b/src/imports/controls/controls.pro @@ -25,7 +25,7 @@ RESOURCES += \ $$PWD/qtlabscontrolsplugin.qrc include(controls.pri) -include(designer/designer.pri) +!ios: include(designer/designer.pri) qtquickcompiler { qmlfiles.prefix = /qt-project.org/imports/Qt/labs/controls |