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>bb10
parent
31f94e0285
commit
83b1ed1ea8
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
TEMPLATE = subdirs
|
||||
|
||||
linux-g++-maemo: SUBDIRS += meego
|
||||
*-maemo*: SUBDIRS += meego
|
||||
|
||||
contains(QT_CONFIG, evdev) {
|
||||
SUBDIRS += evdevmouse evdevtouch evdevkeyboard evdevtablet
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue