diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-15 03:03:05 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-15 03:03:05 +0100 |
| commit | d8f3fb7438bbbe0b807b124f26fe3204ce50c1ec (patch) | |
| tree | 0a08a13c7e6aeed42fa26f2825ddd317a1f2470d /src/controls/controls.pro | |
| parent | 9c3f0688a549c0e57c08d4715b277e05e35849d9 (diff) | |
| parent | 5e2dfd09b3ace43c2f3dc75c56933c7c723b50fb (diff) | |
| download | qtquickcontrols-d8f3fb7438bbbe0b807b124f26fe3204ce50c1ec.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ia98756445b50decfd50f6bdeb94a004fa90d3a05
Diffstat (limited to 'src/controls/controls.pro')
| -rw-r--r-- | src/controls/controls.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/controls/controls.pro b/src/controls/controls.pro index 75871bf0..3119d33d 100644 --- a/src/controls/controls.pro +++ b/src/controls/controls.pro @@ -45,6 +45,7 @@ qtquickcompiler { } else { QML_FILES += $$CONTROLS_QML_FILES !static: CONFIG += qmlcache + else: CONTROLS_QML_FILES += qmldir } SOURCES += $$PWD/plugin.cpp |