diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-14 10:25:01 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-14 10:27:21 +0300 |
commit | 97863a4992276a3d1aeb3c1bb9ef5a280a5e8b12 (patch) | |
tree | b38f6f152e7036b91c25834a917e320955660db2 /basicsuite/advancedcustommaterial/advancedcustommaterial.pro | |
parent | 8be609623fc646e8d9642fc8481a1b9e59fb8417 (diff) | |
parent | aa8e21cc3f60e54dd9c5d1ec482ca440857568f0 (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12
* origin/5.11:
aa8e21c Add new Qt3D demo
ca03367 Exclude demos from colibri imx6ull
a5345fd qtwebbrowser: merge changes from qtwebbrowser git repo
d7e9731 do not enable highdpiscaling on emulator
f730907 Fix mediaplayer default video path
09aa32d Fix some major scaling & font issues on ebike-demo
Change-Id: I044c29ea2908a6254f32b0623037ea63f23d25cb
Diffstat (limited to 'basicsuite/advancedcustommaterial/advancedcustommaterial.pro')
-rw-r--r-- | basicsuite/advancedcustommaterial/advancedcustommaterial.pro | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/basicsuite/advancedcustommaterial/advancedcustommaterial.pro b/basicsuite/advancedcustommaterial/advancedcustommaterial.pro new file mode 100644 index 0000000..a02d283 --- /dev/null +++ b/basicsuite/advancedcustommaterial/advancedcustommaterial.pro @@ -0,0 +1,20 @@ +TARGET = custommaterial + +include(../shared/shared.pri) +b2qtdemo_deploy_defaults() + +content.files = \ + main.qml \ + SceneRoot.qml \ + ControlSlider.qml \ + Water.qml \ + WaterMaterial.qml \ + models \ + shaders \ + textures + +content.path = $$DESTPATH + +OTHER_FILES += $${content.files} + +INSTALLS += target content |