diff options
author | Bernd Weimer <bweimer@blackberry.com> | 2014-07-09 11:58:44 +0200 |
---|---|---|
committer | Bernd Weimer <bweimer@blackberry.com> | 2014-07-28 14:08:22 +0200 |
commit | ec703836b314c419a1c463dc105234f733031535 (patch) | |
tree | 7009d63882089f0c1f6fd612563a4cb421e8c5a3 /src/tools | |
parent | 553325abfd988b062195caae280bbf75b8474ca4 (diff) |
Improve dbus cross compilation
Building QtDBus on Linux host for QNX target had two issues:
* Configure check failed, because dbus-1 library was not linked in,
if target platform doesn't support pkg-config.
* Host tools were not built, because pkg-config was not used to locate
dbus headers on the host.
Task-number: QTBUG-37324
Change-Id: I71d8309599fd40ef2dd8c9e3b44b93a7482019f1
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/bootstrap-dbus/bootstrap-dbus.pro | 2 | ||||
-rw-r--r-- | src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 2 | ||||
-rw-r--r-- | src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/bootstrap-dbus/bootstrap-dbus.pro b/src/tools/bootstrap-dbus/bootstrap-dbus.pro index 62f9f96a9b..fb06b4d8a2 100644 --- a/src/tools/bootstrap-dbus/bootstrap-dbus.pro +++ b/src/tools/bootstrap-dbus/bootstrap-dbus.pro @@ -15,7 +15,7 @@ MODULE_PRIVATE_INCLUDES = \ load(qt_module) -QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS +QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS SOURCES = \ ../../dbus/qdbusintrospection.cpp \ diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro index 655158e457..d65b5ce6ef 100644 --- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro +++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro @@ -3,7 +3,7 @@ QT = core-private force_bootstrap: QT += bootstrap_dbus-private else: QT += dbus-private DEFINES += QT_NO_CAST_FROM_ASCII -QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS +QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS include(../moc/moc.pri) diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro index dcc36c7913..6efcf323b8 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro @@ -3,7 +3,7 @@ QT = core-private force_bootstrap: QT += bootstrap_dbus-private else: QT += dbus-private DEFINES += QT_NO_CAST_FROM_ASCII -QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS +QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS SOURCES = qdbusxml2cpp.cpp |