diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-10 12:08:56 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-10 16:11:57 +0100 |
| commit | 0b9904aab346fc647270ba3fddc8e2b2ef3ed79c (patch) | |
| tree | ecb3740e33cab2a1d6de0b3d7510495020417915 /mkspecs | |
| parent | 38dbb45e79acecf9e98cb283d234a5d7e8b1b470 (diff) | |
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>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/linux-g++-maemo/qmake.conf | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/mkspecs/linux-g++-maemo/qmake.conf b/mkspecs/linux-g++-maemo/qmake.conf index 23f1f71e0f..d5828ab5c8 100644 --- 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) |