diff options
| author | Tony Sarajärvi <tony.sarajarvi@digia.com> | 2015-06-01 13:18:41 +0300 |
|---|---|---|
| committer | Tony Sarajärvi <tony.sarajarvi@digia.com> | 2015-06-01 11:42:10 +0000 |
| commit | 7056cb752ccf7fd65c44dcefa6004ed3d079c9ed (patch) | |
| tree | aeb8d794f2e3bac706beef5ddd455deb4d422f53 | |
| parent | a409eb0e16e6f0dd6d4e8b9e4e48b4f251d3c9bf (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>
| -rw-r--r-- | jenkins/qt-jenkins-ci-integrator.ini | 3 | ||||
| l--------- | projects/QtCanvas3D_wip_threading_Integration/inherits | 1 | ||||
| -rw-r--r-- | projects/QtCanvas3D_wip_threading_Integration/properties/qt.branch | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/jenkins/qt-jenkins-ci-integrator.ini b/jenkins/qt-jenkins-ci-integrator.ini index 154ef506..2afc42f0 100644 --- a/jenkins/qt-jenkins-ci-integrator.ini +++ b/jenkins/qt-jenkins-ci-integrator.ini @@ -154,6 +154,9 @@ branch = 5.4 configurations = linux-g++_shadow-build_Ubuntu_11.10_x86 macx-clang_developer-build_OSX_10.9 win32-msvc2010_developer-build_angle_Windows_7 win32-msvc2010_opengl_dynamic_Windows_7 win32-mingw48_developer-build_qtlibinfix_opengl_Windows_7 branch = wip/newapi +[job.QtCanvas3D_wip_threading_Integration] +branch = wip/threading + ## Special naming ## [job.MessagingFramework_master_Integration] 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 |