diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-03-16 14:21:23 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-03-17 11:25:38 +0000 |
| commit | 294d684d83a7105c44ba3d1298850e21d4505052 (patch) | |
| tree | a1f2e44b072c15edc3c66250c0631cb82d97acf3 /examples | |
| parent | 6457b78169f775723ba764a7f137853f4400a79b (diff) | |
| download | qtactiveqt-294d684d83a7105c44ba3d1298850e21d4505052.tar.gz | |
Suppress registration of the server examples in CI builds.
It does not make sense to register the server examples on the CI
since the registration step is slow and bound to fail if for example
the QPA plugin fails to load in headless environments.
Detect the CI environment by checking on the environment variable
JENKINS_HOME and turn off the axserver post link step accordingly.
Change-Id: I59e8170f071504ee2b141b8a38b594d5bac734c6
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/activeqt/comapp/comapp.pro | 2 | ||||
| -rw-r--r-- | examples/activeqt/hierarchy/hierarchy.pro | 2 | ||||
| -rw-r--r-- | examples/activeqt/menus/menus.pro | 2 | ||||
| -rw-r--r-- | examples/activeqt/multiple/multiple.pro | 2 | ||||
| -rw-r--r-- | examples/activeqt/shared.pri | 7 | ||||
| -rw-r--r-- | examples/activeqt/simple/simple.pro | 2 | ||||
| -rw-r--r-- | examples/activeqt/wrapper/wrapper.pro | 2 |
7 files changed, 19 insertions, 0 deletions
diff --git a/examples/activeqt/comapp/comapp.pro b/examples/activeqt/comapp/comapp.pro index 271241b..c706759 100644 --- a/examples/activeqt/comapp/comapp.pro +++ b/examples/activeqt/comapp/comapp.pro @@ -1,3 +1,5 @@ +include(../shared.pri) + TEMPLATE = app QT += axserver diff --git a/examples/activeqt/hierarchy/hierarchy.pro b/examples/activeqt/hierarchy/hierarchy.pro index c0d534f..acc108a 100644 --- a/examples/activeqt/hierarchy/hierarchy.pro +++ b/examples/activeqt/hierarchy/hierarchy.pro @@ -1,3 +1,5 @@ +include(../shared.pri) + TEMPLATE = lib TARGET = hierarchyax diff --git a/examples/activeqt/menus/menus.pro b/examples/activeqt/menus/menus.pro index be5d75d..0aa677e 100644 --- a/examples/activeqt/menus/menus.pro +++ b/examples/activeqt/menus/menus.pro @@ -1,3 +1,5 @@ +include(../shared.pri) + TEMPLATE = app TARGET = menusax diff --git a/examples/activeqt/multiple/multiple.pro b/examples/activeqt/multiple/multiple.pro index 3254c0e..f08d3a2 100644 --- a/examples/activeqt/multiple/multiple.pro +++ b/examples/activeqt/multiple/multiple.pro @@ -1,3 +1,5 @@ +include(../shared.pri) + TEMPLATE = lib TARGET = multipleax diff --git a/examples/activeqt/shared.pri b/examples/activeqt/shared.pri new file mode 100644 index 0000000..d07afa9 --- /dev/null +++ b/examples/activeqt/shared.pri @@ -0,0 +1,7 @@ +# This .pri file suppresses the registration of the examples in the +# Qt Continuous Integration infrastructure. +QT_CI_JENKINS_HOME=$$(JENKINS_HOME) +!isEmpty(QT_CI_JENKINS_HOME) { + message("Qt CI environment detected, suppressing example registration") + CONFIG += qaxserver_no_postlink +} diff --git a/examples/activeqt/simple/simple.pro b/examples/activeqt/simple/simple.pro index a512c81..33d5410 100644 --- a/examples/activeqt/simple/simple.pro +++ b/examples/activeqt/simple/simple.pro @@ -1,3 +1,5 @@ +include(../shared.pri) + TEMPLATE = app TARGET = simpleax diff --git a/examples/activeqt/wrapper/wrapper.pro b/examples/activeqt/wrapper/wrapper.pro index 229f790..2efbea8 100644 --- a/examples/activeqt/wrapper/wrapper.pro +++ b/examples/activeqt/wrapper/wrapper.pro @@ -1,3 +1,5 @@ +include(../shared.pri) + TEMPLATE = lib TARGET = wrapperax |