diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-11 03:02:47 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-11 03:02:47 +0200 |
| commit | 2785bcb8f0ac04d0d2bc73b06206af1566c43958 (patch) | |
| tree | e617f035f4fd96a23220197cfc4e7fd9d0ed83d9 /src | |
| parent | 057db0fb6c7467eae9bcdd799325a60046e870ef (diff) | |
| parent | 0501cf413309ea70b374d03e8ba7d49f3b4b3e6f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
Diffstat (limited to 'src')
| -rw-r--r-- | src/controls/controls.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/controls.pro b/src/controls/controls.pro index 3119d33d5..39a789041 100644 --- a/src/controls/controls.pro +++ b/src/controls/controls.pro @@ -78,7 +78,7 @@ INCLUDED_RESOURCE_FILES += $$SHADER_FILES controls.files = $$INCLUDED_RESOURCE_FILES controls.prefix = /QtQuick/Controls -RESOURCES += controls +!static:RESOURCES += controls CONFIG += no_cxx_module load(qml_plugin) |