diff options
| author | Tony Sarajärvi <tony.sarajarvi@digia.com> | 2015-06-01 15:16:26 +0300 |
|---|---|---|
| committer | Tony Sarajärvi <tony.sarajarvi@digia.com> | 2015-06-01 12:20:38 +0000 |
| commit | a9b67dd5f51aa7bed2cef501555f15dbea87d6c9 (patch) | |
| tree | aad9ebcb46375c2d6c72f73227855d3689044198 | |
| parent | 7056cb752ccf7fd65c44dcefa6004ed3d079c9ed (diff) | |
Move Canvas3D threading to work on dev configurations
Change-Id: Ia09591b57cf26c6ea64505d0e3e796f576d0df8f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Reviewed-by: Heikki Halmet <heikki.halmet@theqtcompany.com>
| -rw-r--r-- | jenkins/qt-jenkins-ci-integrator-dev.ini | 3 | ||||
| -rw-r--r-- | jenkins/qt-jenkins-ci-integrator.ini | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/jenkins/qt-jenkins-ci-integrator-dev.ini b/jenkins/qt-jenkins-ci-integrator-dev.ini index 0862a3e5..6a8fb52d 100644 --- a/jenkins/qt-jenkins-ci-integrator-dev.ini +++ b/jenkins/qt-jenkins-ci-integrator-dev.ini @@ -121,3 +121,6 @@ gerrit_project = qt/qtx11extras configurations = linux-g++_shadow-build_Ubuntu_14.04_x64 win32-msvc2010_Windows_7 linux-g++_developer-build_OpenSuSE_13.1_x64 linux-g++_developer-build_qtnamespace_qtlibinfix_RHEL_6.6_x64 branch = dev +[job.QtCanvas3D_wip_threading_Integration] +branch = wip/threading + diff --git a/jenkins/qt-jenkins-ci-integrator.ini b/jenkins/qt-jenkins-ci-integrator.ini index 2afc42f0..154ef506 100644 --- a/jenkins/qt-jenkins-ci-integrator.ini +++ b/jenkins/qt-jenkins-ci-integrator.ini @@ -154,9 +154,6 @@ 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] |