summaryrefslogtreecommitdiffstats
path: root/projects
diff options
context:
space:
mode:
authorTony Sarajärvi <tony.sarajarvi@digia.com>2015-06-01 13:18:41 +0300
committerTony Sarajärvi <tony.sarajarvi@digia.com>2015-06-01 11:42:10 +0000
commit7056cb752ccf7fd65c44dcefa6004ed3d079c9ed (patch)
treeaeb8d794f2e3bac706beef5ddd455deb4d422f53 /projects
parenta409eb0e16e6f0dd6d4e8b9e4e48b4f251d3c9bf (diff)
Add QtCanvas3D threading configurations
Change-Id: I220cb40a18661a9f194e9e58e86039a12d8a7de5 Reviewed-by: Jani Vähäkangas <jani.vahakangas@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com> Reviewed-by: Heikki Halmet <heikki.halmet@theqtcompany.com>
Diffstat (limited to 'projects')
l---------projects/QtCanvas3D_wip_threading_Integration/inherits1
-rw-r--r--projects/QtCanvas3D_wip_threading_Integration/properties/qt.branch1
2 files changed, 2 insertions, 0 deletions
diff --git a/projects/QtCanvas3D_wip_threading_Integration/inherits b/projects/QtCanvas3D_wip_threading_Integration/inherits
new file mode 120000
index 00000000..7f546246
--- /dev/null
+++ b/projects/QtCanvas3D_wip_threading_Integration/inherits
@@ -0,0 +1 @@
+../QtCanvas3D_Integration/ \ No newline at end of file
diff --git a/projects/QtCanvas3D_wip_threading_Integration/properties/qt.branch b/projects/QtCanvas3D_wip_threading_Integration/properties/qt.branch
new file mode 100644
index 00000000..38f8e886
--- /dev/null
+++ b/projects/QtCanvas3D_wip_threading_Integration/properties/qt.branch
@@ -0,0 +1 @@
+dev