diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-08 03:02:32 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-08 03:02:32 +0200 |
| commit | 5a6349f64bad279e0981a99f7634f13728ecefa3 (patch) | |
| tree | a9b0e08ff11ba7ff2e054bfa3c6778e520ab0b8b /src/controls | |
| parent | 4acab46571b793d7a00c9fe768d9ca91a47ea6bb (diff) | |
| parent | 0f74e642bf1f13f6b097b1a8e1412ca3cb6e85b5 (diff) | |
| download | qtquickcontrols-5a6349f64bad279e0981a99f7634f13728ecefa3.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I8c71c934d005841d9512b29bd6d5285f966033f1
Diffstat (limited to 'src/controls')
| -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 3119d33d..39a78904 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) |