diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:13:00 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:13:00 +0200 |
| commit | 3fd3ffade59c923014e02d5d6b07288b24c9493d (patch) | |
| tree | e3a0fac8dcb36931d870f93805acfe43a6d86f9f /examples | |
| parent | ed8d0964b81186824bca5771da224a60a6ccb4e3 (diff) | |
| parent | 70c22cb89f1c923c71cbc1a477c862fd947161e6 (diff) | |
| download | qtactiveqt-3fd3ffade59c923014e02d5d6b07288b24c9493d.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
qtactiveqt.pro
Change-Id: Ie6deaadc8cf69e111a0ae7ebef420b4f47e3b9a3
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 |