diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-19 14:31:56 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-19 14:31:56 +0200 |
| commit | 3b093789b07c670e29d3275e26c4e7122db042ae (patch) | |
| tree | 46d11026341721183560a4168550987b7633f40b /src/controls/controls.pro | |
| parent | 94c511b63af10a5507936ab7fbdd517144cde872 (diff) | |
| parent | d9aae9ff99d20b58487b0a48801864d13115363b (diff) | |
| download | qtquickcontrols-3b093789b07c670e29d3275e26c4e7122db042ae.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/controls/controls.pro
Change-Id: I0150ca08d83f292a5c8587ec886e206124757df4
Diffstat (limited to 'src/controls/controls.pro')
| -rw-r--r-- | src/controls/controls.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/controls/controls.pro b/src/controls/controls.pro index 8efc2271..63d055d6 100644 --- a/src/controls/controls.pro +++ b/src/controls/controls.pro @@ -88,6 +88,8 @@ osx: LIBS_PRIVATE += -framework Carbon $$PRIVATE_QML_FILES \ $$STYLES_QML_FILES \ $$SHADER_FILES + OTHER_FILES += $$QML_FILES } + CONFIG += no_cxx_module load(qml_plugin) |