diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2012-10-03 15:11:56 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-13 02:18:07 +0200 |
| commit | 10550cbff189dba8dfc2046c57f1974a2fc8727a (patch) | |
| tree | 53b4b744a7f978f3882ee0ec39e79fdbf6a875b8 /src | |
| parent | 1a13dbe720db2559bb6748a55f58cf90b5c57f0b (diff) | |
| download | qtactiveqt-10550cbff189dba8dfc2046c57f1974a2fc8727a.tar.gz | |
Make ActiveQt libraries build both debug and release versions
Since ActiveQt libraries don't load qt_module.prf, build_all doesn't
get added to CONFIG automatically. This resulted in only debug version
of the libraries getting built when Qt was configured for building
both debug and release.
Fixed by making sure build_all and debug_and_release are added to
CONFIG explicitly in affected libraries if they are present in
QT_CONFIG.
Task-number: QTBUG-27422
Change-Id: I1338af79457f5337ac95b5c878d384f3e86a589d
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/activeqt/container/container.pro | 3 | ||||
| -rw-r--r-- | src/activeqt/control/control.pro | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/activeqt/container/container.pro b/src/activeqt/container/container.pro index 8b27f7b..66d4f87 100644 --- a/src/activeqt/container/container.pro +++ b/src/activeqt/container/container.pro @@ -2,6 +2,9 @@ TEMPLATE = lib TARGET = QAxContainer CONFIG += create_prl +contains(QT_CONFIG, debug_and_release):CONFIG += debug_and_release +contains(QT_CONFIG, build_all):CONFIG += build_all + !debug_and_release|build_pass { CONFIG(debug, debug|release) { TARGET = $$member(TARGET, 0)d diff --git a/src/activeqt/control/control.pro b/src/activeqt/control/control.pro index f74d525..157a2fa 100644 --- a/src/activeqt/control/control.pro +++ b/src/activeqt/control/control.pro @@ -2,6 +2,9 @@ TEMPLATE = lib TARGET = QAxServer CONFIG += create_prl +contains(QT_CONFIG, debug_and_release):CONFIG += debug_and_release +contains(QT_CONFIG, build_all):CONFIG += build_all + !debug_and_release|build_pass { CONFIG(debug, debug|release) { TARGET = $$member(TARGET, 0)d |