diff options
| author | Laszlo Papp <lpapp@kde.org> | 2012-09-14 15:21:34 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-14 19:07:15 +0200 |
| commit | 83b1ed1ea8168e3de15de7a8a44a5224db5a2284 (patch) | |
| tree | 575d262ad99e2479cc6cddc15009ec561cd637b8 /src/plugins | |
| parent | 31f94e028527ffa02b954a3a91eabe80e2926838 (diff) | |
Make maemo scope syntax in project files more generic
It is necessary to use the n9 device file for now in scratchbox or/and on the
community open build service because the maemo platform mkspecs file assumes
that a cross-toolchain is used all the time. If no platform file is used, then
for instance certain plugins may not be built in general. There is currently an
ongoing issue with the meego plugin for context management in the Harmattan
components project. That is currently not built due to this issue, so no
orientation works in those applications.
The nice solution would be to make the maemo platform file work with cross and
native toolchains as well, but that requires a decent amount of investigation
and work. Thereby, the scope is extended this way for now.
Change-Id: I172c7d152bdbb2db279526d9fd1ca5648d0cd0a9
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/generic/generic.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/xcb.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/generic/generic.pro b/src/plugins/generic/generic.pro index f2e3bd3f44..078db2f477 100644 --- a/src/plugins/generic/generic.pro +++ b/src/plugins/generic/generic.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs -linux-g++-maemo: SUBDIRS += meego +*-maemo*: SUBDIRS += meego contains(QT_CONFIG, evdev) { SUBDIRS += evdevmouse evdevtouch evdevkeyboard evdevtablet diff --git a/src/plugins/platforms/xcb/xcb.pro b/src/plugins/platforms/xcb/xcb.pro index 76cdbf488b..df37e59365 100644 --- a/src/plugins/platforms/xcb/xcb.pro +++ b/src/plugins/platforms/xcb/xcb.pro @@ -47,7 +47,7 @@ contains(QT_CONFIG, xcb-xlib) { DEFINES += XCB_USE_XLIB LIBS += -lX11 -lX11-xcb - linux-g++-maemo { + *-maemo* { contains(QT_CONFIG, xinput2) { # XInput2 support for Harmattan. DEFINES += XCB_USE_XINPUT2_MAEMO |