diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | src/plugins/generic/generic.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/xcb.pro | 2 | ||||
| -rw-r--r-- | src/tools/uic/uic.pro | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -2455,7 +2455,7 @@ fi [ -z "$XPLATFORM" ] && XPLATFORM="$PLATFORM" case `basename "$XPLATFORM"` in win32-g++*) XPLATFORM_MINGW=yes;; esac -case "$XPLATFORM" in linux-g++-maemo) XPLATFORM_MAEMO=yes;; esac +case "$XPLATFORM" in *-maemo*) XPLATFORM_MAEMO=yes;; esac case "$XPLATFORM" in *qnx-*|*blackberry-*) XPLATFORM_QNX=yes;; esac if [ -d "$PLATFORM" ]; then 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 diff --git a/src/tools/uic/uic.pro b/src/tools/uic/uic.pro index c4b7ca2e19..d481168ac2 100644 --- a/src/tools/uic/uic.pro +++ b/src/tools/uic/uic.pro @@ -13,7 +13,7 @@ HEADERS += uic.h SOURCES += main.cpp \ uic.cpp -linux-g++-maemo { +*-maemo* { # UIC will crash when running inside QEMU if built with -O2 QMAKE_CFLAGS_RELEASE -= -O2 QMAKE_CXXFLAGS_RELEASE -= -O2 |