public
Created

  • Download Gist
gistfile1.patch
Diff
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39
commit 0b9904aab346fc647270ba3fddc8e2b2ef3ed79c
Author: Simon Hausmann <simon.hausmann@nokia.com>
Date: Fri Feb 10 12:08:56 2012 +0100
 
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
--- 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)

Please sign in to comment on this gist.

Something went wrong with that request. Please try again.