diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2012-03-15 11:37:28 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-20 10:56:17 (GMT) |
| commit | 40bfc0b25734895ec78fa5099028c31a8daa0371 (patch) | |
| tree | a5afda826756f6f2d5c36b14cdf0b432034600c2 /mkspecs/linux-g++-maemo | |
| parent | 2404eb37bc8df5e375ca09362cc7fd3f5fdbc99d (diff) | |
| download | Qt-40bfc0b25734895ec78fa5099028c31a8daa0371.zip Qt-40bfc0b25734895ec78fa5099028c31a8daa0371.tar.gz Qt-40bfc0b25734895ec78fa5099028c31a8daa0371.tar.bz2 | |
Backported linux-g++-maemo mkspec changes from Qt5
This change factors out common configuration for Linux ARM targets
into a subsiduary mkspec which is included by linux-g++-maemo.
Cherry-picked from qtbase commit 3f09c6a1762db9ea05f3815235ac0937d004ee9e
Change-Id: I9d7852e8b2e891217c3bee2964cddfef526d1d5f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs/linux-g++-maemo')
| -rw-r--r-- | mkspecs/linux-g++-maemo/qmake.conf | 16 | ||||
| -rw-r--r-- | mkspecs/linux-g++-maemo/qplatformdefs.h | 2 |
2 files changed, 2 insertions, 16 deletions
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) diff --git a/mkspecs/linux-g++-maemo/qplatformdefs.h b/mkspecs/linux-g++-maemo/qplatformdefs.h index 416ce77..7f6351f 100644 --- a/mkspecs/linux-g++-maemo/qplatformdefs.h +++ b/mkspecs/linux-g++-maemo/qplatformdefs.h @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "../linux-g++/qplatformdefs.h" +#include "../linux-arm-gnueabi-g++/qplatformdefs.h" #define QT_GUI_DOUBLE_CLICK_RADIUS 20 #define QT_GUI_DRAG_DISTANCE 16 |