From f91eef84a37d0496d42dbdad0b8be40e55af792e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Date: Mon, 13 Oct 2014 14:45:00 +0200 Subject: [PATCH] explicitly declare the module master header we are delegating to the axbase module, but the master header generation does not resolve transitive deps, so we need this crutch. Task-number: QTBUG-41892 Change-Id: Ief7e8c4bde6fbea7ce6503f67d3b9d5787e09007 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> --- src/activeqt/container/container.pro | 1 + src/activeqt/control/control.pro | 1 + 2 files changed, 2 insertions(+) diff --git a/src/activeqt/container/container.pro b/src/activeqt/container/container.pro index 904a0244..4bfeb341 100644 --- a/src/activeqt/container/container.pro +++ b/src/activeqt/container/container.pro @@ -26,6 +26,7 @@ FORMS = qaxselect.ui MODULE = axcontainer MODULE_CONFIG = dumpcpp +MODULE_MASTER_HEADER = ActiveQt CONFIG += no_module_headers load(qt_module) DEFINES -= QT_NO_CAST_TO_ASCII QT_USE_QSTRINGBUILDER diff --git a/src/activeqt/control/control.pro b/src/activeqt/control/control.pro index 3f43f5d9..20a5ea3e 100644 --- a/src/activeqt/control/control.pro +++ b/src/activeqt/control/control.pro @@ -22,6 +22,7 @@ SOURCES = qaxserver.cpp \ MODULE = axserver MODULE_DEFINES = QAXSERVER MODULE_CONFIG = idcidl force_import_plugins +MODULE_MASTER_HEADER = ActiveQt CONFIG += no_module_headers load(qt_module) DEFINES -= QT_NO_CAST_TO_ASCII QT_USE_QSTRINGBUILDER -- GitLab