diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-11-04 07:14:37 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-06-21 21:53:04 +0200 |
| commit | 834ce96df4501478e2152ae4e72cb286ebea1d01 (patch) | |
| tree | 6828d212806d41694f5942b6f23913059eb4b025 /patches | |
| parent | 9a22cb31cbda99aae1e5a3956149425cdacf986d (diff) | |
| download | ptxdist-834ce96df4501478e2152ae4e72cb286ebea1d01.tar.gz ptxdist-834ce96df4501478e2152ae4e72cb286ebea1d01.tar.xz | |
[qt4] add X11 support
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/qt-everywhere-opensource-src-4.6.3/ptx-mkspec.diff | 55 |
1 files changed, 52 insertions, 3 deletions
diff --git a/patches/qt-everywhere-opensource-src-4.6.3/ptx-mkspec.diff b/patches/qt-everywhere-opensource-src-4.6.3/ptx-mkspec.diff index 405729189..328b10699 100644 --- a/patches/qt-everywhere-opensource-src-4.6.3/ptx-mkspec.diff +++ b/patches/qt-everywhere-opensource-src-4.6.3/ptx-mkspec.diff @@ -9,9 +9,11 @@ Add a mkspec for ptxdist: Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- - mkspecs/qws/linux-ptx-g++/qmake.conf.in | 25 +++++++++++++++++++++++++ - mkspecs/qws/linux-ptx-g++/qplatformdefs.h | 2 ++ - 2 files changed, 27 insertions(+) + mkspecs/linux-ptx-g++/qmake.conf.in | 35 ++++++++++++++++++++++++++++++ + mkspecs/linux-ptx-g++/qplatformdefs.h | 2 + + mkspecs/qws/linux-ptx-g++/qmake.conf.in | 25 +++++++++++++++++++++ + mkspecs/qws/linux-ptx-g++/qplatformdefs.h | 2 + + 4 files changed, 64 insertions(+) Index: b/mkspecs/qws/linux-ptx-g++/qmake.conf.in =================================================================== @@ -50,3 +52,50 @@ Index: b/mkspecs/qws/linux-ptx-g++/qplatformdefs.h @@ -0,0 +1,2 @@ + +#include "../../linux-g++/qplatformdefs.h" +Index: b/mkspecs/linux-ptx-g++/qmake.conf.in +=================================================================== +--- /dev/null ++++ b/mkspecs/linux-ptx-g++/qmake.conf.in +@@ -0,0 +1,35 @@ ++# ++# qmake configuration for linux-ptx-g++ ++# ++ ++ ++include(../common/g++.conf) ++include(../common/linux.conf) ++ ++MAKEFILE_GENERATOR = UNIX ++TEMPLATE = app ++CONFIG += qt warn_on release incremental link_prl ++QT += core gui network ++QMAKE_INCREMENTAL_STYLE = sublib ++ ++# modifications to g++.conf ++QMAKE_CC = @COMPILER_PREFIX@gcc ++QMAKE_CXX = @COMPILER_PREFIX@g++ ++QMAKE_INCDIR = @INCDIR@ ++QMAKE_LIBDIR = @LIBDIR@ ++ ++QMAKE_LINK = @COMPILER_PREFIX@g++ ++QMAKE_LINK_SHLIB = @COMPILER_PREFIX@g++ ++QMAKE_LFLAGS = @LDFLAGS@ ++ ++QMAKE_INCDIR_X11 = ++QMAKE_LIBDIR_X11 = ++QMAKE_INCDIR_OPENGL = ++QMAKE_LIBDIR_OPENGL = ++ ++# modifications to linux.conf ++QMAKE_AR = @COMPILER_PREFIX@ar cqs ++QMAKE_OBJCOPY = @COMPILER_PREFIX@objcopy ++QMAKE_STRIP = @COMPILER_PREFIX@strip ++ ++load(qt_config) +Index: b/mkspecs/linux-ptx-g++/qplatformdefs.h +=================================================================== +--- /dev/null ++++ b/mkspecs/linux-ptx-g++/qplatformdefs.h +@@ -0,0 +1,2 @@ ++ ++#include "../linux-g++/qplatformdefs.h" |