diff options
| author | Robert Griebl <robert.griebl@pelagicore.com> | 2018-10-09 16:38:19 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2018-10-11 07:34:13 +0000 |
| commit | 3e29bf47c350237863b37410dba465a6b3e44f71 (patch) | |
| tree | 3ced581d1ad127d0bef3f7be3b37acd08429f8b2 | |
| parent | d3e805681744b1156edeb3264292d757ea7368f8 (diff) | |
| download | qtapplicationmanager-3e29bf47c350237863b37410dba465a6b3e44f71.tar.gz | |
Really fix the "Undefined interface" error
The problem comes from generating the DBus adaptors via a custom compiler:
the code for that was copied from the official dbusadaptors.prf file in Qt,
but the moc custom-compiler step in this prf file messes with the
INCLUDEPATH.
This problem is actually related to the order in which qmake is loading the
prf features from the CONFIG variable: if we prepend the dbus-adaptor-xml
feature, it will load the moc.prf feature in the right state.
Change-Id: I3a735fafc24792c0a6bfa5b291640ba09f6844a8
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
| -rw-r--r-- | qmake-features/dbus-adaptors-xml.prf | 4 | ||||
| -rw-r--r-- | src/dbus-lib/dbus-lib.pro | 3 | ||||
| -rw-r--r-- | src/manager-lib/fakeapplicationmanagerwindow.h | 2 | ||||
| -rw-r--r-- | src/manager-lib/qmlinprocessapplicationinterface.h | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/qmake-features/dbus-adaptors-xml.prf b/qmake-features/dbus-adaptors-xml.prf index 529954a6..01e5a47b 100644 --- a/qmake-features/dbus-adaptors-xml.prf +++ b/qmake-features/dbus-adaptors-xml.prf @@ -10,6 +10,8 @@ adaptors_header.variable_out = dbus_adaptor_headers adaptors_header.input = ADAPTORS_XML adaptors_header.CONFIG += target_predep +QMAKE_EXTRA_COMPILERS += adaptors_header + adaptors_moc.commands = $$moc_header.commands adaptors_moc.depends += $$QMAKE_MOC_EXE adaptors_moc.output = $$moc_header.output @@ -17,4 +19,4 @@ adaptors_moc.input = dbus_adaptor_headers adaptors_moc.variable_out = GENERATED_SOURCES adaptors_moc.name = DBUS adaptor MOC headers -QMAKE_EXTRA_COMPILERS += adaptors_header adaptors_moc +QMAKE_EXTRA_COMPILERS += adaptors_moc diff --git a/src/dbus-lib/dbus-lib.pro b/src/dbus-lib/dbus-lib.pro index 1df1cb01..90cb1eda 100644 --- a/src/dbus-lib/dbus-lib.pro +++ b/src/dbus-lib/dbus-lib.pro @@ -9,7 +9,8 @@ QT_FOR_PRIVATE *= \ appman_common-private \ appman_manager-private \ -CONFIG *= static internal_module dbus-adaptors-xml +CONFIG *= static internal_module +CONFIG = dbus-adaptors-xml $$CONFIG HEADERS += \ dbuspolicy.h \ diff --git a/src/manager-lib/fakeapplicationmanagerwindow.h b/src/manager-lib/fakeapplicationmanagerwindow.h index 9c8c2062..2ba19f17 100644 --- a/src/manager-lib/fakeapplicationmanagerwindow.h +++ b/src/manager-lib/fakeapplicationmanagerwindow.h @@ -43,7 +43,7 @@ #if !defined(AM_HEADLESS) # include <QSharedPointer> -# include <QtQml/QQmlParserStatus> +# include <QQmlParserStatus> # include <QColor> # include <QQuickItem> # include <QtAppManCommon/global.h> diff --git a/src/manager-lib/qmlinprocessapplicationinterface.h b/src/manager-lib/qmlinprocessapplicationinterface.h index bca944b4..5f5b0c7d 100644 --- a/src/manager-lib/qmlinprocessapplicationinterface.h +++ b/src/manager-lib/qmlinprocessapplicationinterface.h @@ -43,7 +43,7 @@ #include <QVector> #include <QPointer> -#include <QtQml/QQmlParserStatus> +#include <QQmlParserStatus> #include <QtAppManApplication/applicationinterface.h> #include <QtAppManNotification/notification.h> |