diff options
| -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 | ||||
| -rw-r--r-- | qtactiveqt.pro | 3 | ||||
| -rw-r--r-- | src/tools/idc/main.cpp | 2 |
9 files changed, 23 insertions, 1 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 diff --git a/qtactiveqt.pro b/qtactiveqt.pro index b993871..83d709a 100644 --- a/qtactiveqt.pro +++ b/qtactiveqt.pro @@ -1,4 +1,7 @@ CONFIG += tests_need_tools load(qt_parts) +!win32|winrt|wince { + message("ActiveQt is a Windows Desktop-only module. Will just generate a docs target.") +} SUBDIRS = src diff --git a/src/tools/idc/main.cpp b/src/tools/idc/main.cpp index 1cd0ed0..6f00477 100644 --- a/src/tools/idc/main.cpp +++ b/src/tools/idc/main.cpp @@ -140,7 +140,7 @@ static bool runWithQtInEnvironment(const QString &cmd) CloseHandle(pi.hThread); CloseHandle(pi.hProcess); if (exitCode) - fprintf(stderr, "\"%s\" returned exit code: %ul\n", qPrintable(cmd), exitCode); + fprintf(stderr, "\"%s\" returned exit code: %lu (0x%lx)\n", qPrintable(cmd), exitCode, exitCode); return exitCode == 0; } |