diff options
| author | Tony Sarajärvi <tony.sarajarvi@digia.com> | 2014-08-13 13:47:26 +0300 |
|---|---|---|
| committer | Tony Sarajärvi <tony.sarajarvi@digia.com> | 2014-08-13 12:54:12 +0200 |
| commit | 49573cbc575024796d28f10254877a1bd4605f1a (patch) | |
| tree | 0ff830fb2bd1cd054c425ed0668a3662c8e9c81a | |
| parent | 3f941dd77573afd805648be68a9f5b209de8338c (diff) | |
Add QtWayland_5.4 to Jenkins
Change-Id: I05d2924d252b787bf96cd47b9687c90e056b69cf
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
9 files changed, 14 insertions, 0 deletions
diff --git a/jenkins/qt-jenkins-ci-dev-integrator.ini b/jenkins/qt-jenkins-ci-dev-integrator.ini index aa224b7c..4301cb40 100644 --- a/jenkins/qt-jenkins-ci-dev-integrator.ini +++ b/jenkins/qt-jenkins-ci-dev-integrator.ini @@ -268,6 +268,9 @@ configurations = linux-g++_developer-build_OpenSuSE_13.1_x64 [job.QtWayland_stable_Integration] configurations = linux-g++_developer-build_OpenSuSE_13.1_x64 +[job.QtWayland_5.4_Integration] +configurations = linux-g++_developer-build_OpenSuSE_13.1_x64 + [job.QtWebEngine_dev_Integration] gerrit_project = qt/qtwebengine branch = dev diff --git a/jenkins/qt-jenkins-ci-integrator.ini b/jenkins/qt-jenkins-ci-integrator.ini index 72356465..6ad6c2fd 100644 --- a/jenkins/qt-jenkins-ci-integrator.ini +++ b/jenkins/qt-jenkins-ci-integrator.ini @@ -448,6 +448,9 @@ configurations = linux-g++_developer-build_OpenSuSE_13.1_x64 [job.QtWayland_stable_Integration] configurations = linux-g++_developer-build_OpenSuSE_13.1_x64 +[job.QtWayland_5.4_Integration] +configurations = linux-g++_developer-build_OpenSuSE_13.1_x64 + # Non-standard naming of test config [job.QtWebEngine_dev_Integration] diff --git a/projects/QtWayland_5.4_Integration/inherits b/projects/QtWayland_5.4_Integration/inherits new file mode 120000 index 00000000..d957352f --- /dev/null +++ b/projects/QtWayland_5.4_Integration/inherits @@ -0,0 +1 @@ +../QtWayland_Integration/
\ No newline at end of file diff --git a/projects/QtWayland_5.4_Integration/properties/qt.branch b/projects/QtWayland_5.4_Integration/properties/qt.branch new file mode 100644 index 00000000..38f8e886 --- /dev/null +++ b/projects/QtWayland_5.4_Integration/properties/qt.branch @@ -0,0 +1 @@ +dev diff --git a/projects/QtWayland_5.4_Integration/stages/linux-g++_developer-build_OpenSuSE_13.1_x64/environment/QMAKEFLAGS b/projects/QtWayland_5.4_Integration/stages/linux-g++_developer-build_OpenSuSE_13.1_x64/environment/QMAKEFLAGS new file mode 100644 index 00000000..30c469c1 --- /dev/null +++ b/projects/QtWayland_5.4_Integration/stages/linux-g++_developer-build_OpenSuSE_13.1_x64/environment/QMAKEFLAGS @@ -0,0 +1 @@ +CONFIG+=wayland-compositor diff --git a/projects/QtWayland_5.4_Integration/stages/linux-g++_developer-build_OpenSuSE_13.1_x64/forcesuccess b/projects/QtWayland_5.4_Integration/stages/linux-g++_developer-build_OpenSuSE_13.1_x64/forcesuccess new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/projects/QtWayland_5.4_Integration/stages/linux-g++_developer-build_OpenSuSE_13.1_x64/forcesuccess @@ -0,0 +1 @@ +1 diff --git a/projects/QtWayland_5.4_Integration/stages/linux-g++_developer-build_OpenSuSE_13.1_x64/properties/qt.configure.extra_args b/projects/QtWayland_5.4_Integration/stages/linux-g++_developer-build_OpenSuSE_13.1_x64/properties/qt.configure.extra_args new file mode 100644 index 00000000..5a8f9cd9 --- /dev/null +++ b/projects/QtWayland_5.4_Integration/stages/linux-g++_developer-build_OpenSuSE_13.1_x64/properties/qt.configure.extra_args @@ -0,0 +1 @@ +-silent -no-pch -opengl es2 -force-pkg-config -xcb -developer-build diff --git a/projects/QtWayland_5.4_Integration/stages/linux-g++_developer-build_OpenSuSE_13.1_x64/properties/qt.qtqa-tests.enabled b/projects/QtWayland_5.4_Integration/stages/linux-g++_developer-build_OpenSuSE_13.1_x64/properties/qt.qtqa-tests.enabled new file mode 100644 index 00000000..573541ac --- /dev/null +++ b/projects/QtWayland_5.4_Integration/stages/linux-g++_developer-build_OpenSuSE_13.1_x64/properties/qt.qtqa-tests.enabled @@ -0,0 +1 @@ +0 diff --git a/projects/QtWayland_5.4_Integration/stages/linux-g++_developer-build_OpenSuSE_13.1_x64/properties/qt.tests.insignificant b/projects/QtWayland_5.4_Integration/stages/linux-g++_developer-build_OpenSuSE_13.1_x64/properties/qt.tests.insignificant new file mode 100644 index 00000000..d474e1b4 --- /dev/null +++ b/projects/QtWayland_5.4_Integration/stages/linux-g++_developer-build_OpenSuSE_13.1_x64/properties/qt.tests.insignificant @@ -0,0 +1,2 @@ +1 + |