Fix Harmattan compile target to be usable outside of Scratchbox

Simply include the generic arm-gnueabi configuration. This should work
from within and outside sbox, but at the same time keeping this mkspec
allows us to enable Harmattan specific features such as the xinput2/touch
support in the xcb back-end.

Change-Id: I5cc0cdc3e222deb6374580392c3e3aadfc3a4bd9
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@nokia.com>

diff --git a/mkspecs/linux-g++-maemo/qmake.conf b/mkspecs/linux-g++-maemo/qmake.conf
index 23f1f71..d5828ab 100644 (file)
--- a/mkspecs/linux-g++-maemo/qmake.conf
+++ b/mkspecs/linux-g++-maemo/qmake.conf
@@ -10,19 +10,5 @@ CONFIG                 += nostrip
 QT                     += core gui
 QMAKE_INCREMENTAL_STYLE = sublib
 
-include(../common/linux.conf)
-include(../common/gcc-base-unix.conf)
-include(../common/g++-unix.conf)
+include(../linux-arm-gnueabi-g++/qmake.conf)
 
-
-# Override the default lib/include directories for scratchbox:
-QMAKE_INCDIR_X11      = /usr/include/X11
-QMAKE_INCDIR_OPENGL   = /usr/include
-QMAKE_LIBDIR_X11      = /usr/lib
-QMAKE_LIBDIR_OPENGL   = /usr/lib
-
-# We still need to generate debug symbols in release mode to put into the *-dbg packages:
-QMAKE_CFLAGS_RELEASE    += -g -Wno-psabi
-QMAKE_CXXFLAGS_RELEASE  += -g -Wno-psabi
-
-load(qt_config)