1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/qws/linux-sharp-g++/qmake.conf b/mkspecs/qws/linux-sharp-g++/qmake.conf
index 3e25a1e..814b4fc 100644
--- a/mkspecs/qws/linux-sharp-g++/qmake.conf
+++ b/mkspecs/qws/linux-sharp-g++/qmake.conf
@@ -1,50 +1,50 @@
 #
 # $Id$
 #
 # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler
 #
        MAKEFILE_GENERATOR= UNIX
        TEMPLATE        = app
        CONFIG          += qt warn_on release
        QMAKE_CC        = arm-linux-gcc
        QMAKE_LEX       = flex
        QMAKE_LEXFLAGS  =
        QMAKE_YACC      = yacc
        QMAKE_YACCFLAGS         = -d
-        QMAKE_CFLAGS    = -x c++ -pipe $(CFLAGS_EXTRA)
+        QMAKE_CFLAGS    = -pipe $(CFLAGS_EXTRA)
        QMAKE_CFLAGS_WARN_ON= -Wall -W
        QMAKE_CFLAGS_WARN_OFF=
        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
        QMAKE_CFLAGS_DEBUG= -g
        QMAKE_CFLAGS_SHLIB= -fPIC
        QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
        QMAKE_CFLAGS_THREAD= -D_REENTRANT
        QMAKE_CXX       = arm-linux-g++ -DQT_QWS_SL5XXX -DQT_QWS_SHARP -DQT_QWS_EBX -DQT_QWS_CUSTOM
-        QMAKE_CXXFLAGS  = -x c++ $$QMAKE_CFLAGS  -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
+        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS  -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
        QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
        QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
        QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
        QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
        QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
        QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
        QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
        QMAKE_INCDIR    =
        QMAKE_LIBDIR    =
        QMAKE_INCDIR_X11= 
        QMAKE_LIBDIR_X11= 
        QMAKE_INCDIR_QT         = $(QTDIR)/include
        QMAKE_LIBDIR_QT         = $(QTDIR)/lib
        QMAKE_INCDIR_OPENGL= /usr/X11R6/include
        QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
        QMAKE_LINK      = arm-linux-gcc
        QMAKE_LINK_SHLIB= arm-linux-gcc
        QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
        QMAKE_LFLAGS_RELEASE=
        QMAKE_LFLAGS_DEBUG=
 QMAKE_LFLAGS_SHLIB      = -shared
 QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB

diff --git a/mkspecs/qws/linux-sharp-g++/qmake.conf b/mkspecs/qws/linux-sharp-g++/qmake.conf index 3e25a1e..814b4fc 100644 --- a/mkspecs/qws/linux-sharp-g++/qmake.conf +++ b/mkspecs/qws/linux-sharp-g++/qmake.conf
@@ -1,50 +1,50 @@
1	#	1	#
2	# $Id$	2	# $Id$
3	#	3	#
4	# qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler	4	# qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler
5	#	5	#
6		6
7	MAKEFILE_GENERATOR= UNIX	7	MAKEFILE_GENERATOR= UNIX
8	TEMPLATE = app	8	TEMPLATE = app
9	CONFIG += qt warn_on release	9	CONFIG += qt warn_on release
10		10
11	QMAKE_CC = arm-linux-gcc	11	QMAKE_CC = arm-linux-gcc
12	QMAKE_LEX = flex	12	QMAKE_LEX = flex
13	QMAKE_LEXFLAGS =	13	QMAKE_LEXFLAGS =
14	QMAKE_YACC = yacc	14	QMAKE_YACC = yacc
15	QMAKE_YACCFLAGS = -d	15	QMAKE_YACCFLAGS = -d
16	QMAKE_CFLAGS = -x c++ -pipe $(CFLAGS_EXTRA)	16	QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA)
17	QMAKE_CFLAGS_WARN_ON= -Wall -W	17	QMAKE_CFLAGS_WARN_ON= -Wall -W
18	QMAKE_CFLAGS_WARN_OFF=	18	QMAKE_CFLAGS_WARN_OFF=
19	QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)	19	QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
20	QMAKE_CFLAGS_DEBUG= -g	20	QMAKE_CFLAGS_DEBUG= -g
21	QMAKE_CFLAGS_SHLIB= -fPIC	21	QMAKE_CFLAGS_SHLIB= -fPIC
22	QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses	22	QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
23	QMAKE_CFLAGS_THREAD= -D_REENTRANT	23	QMAKE_CFLAGS_THREAD= -D_REENTRANT
24		24
25	QMAKE_CXX = arm-linux-g++ -DQT_QWS_SL5XXX -DQT_QWS_SHARP -DQT_QWS_EBX -DQT_QWS_CUSTOM	25	QMAKE_CXX = arm-linux-g++ -DQT_QWS_SL5XXX -DQT_QWS_SHARP -DQT_QWS_EBX -DQT_QWS_CUSTOM
26	QMAKE_CXXFLAGS = -x c++ $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)	26	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
27	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON	27	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
28	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF	28	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
29	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE	29	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
30	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG	30	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
31	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB	31	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
32	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC	32	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
33	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD	33	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
34		34
35	QMAKE_INCDIR =	35	QMAKE_INCDIR =
36	QMAKE_LIBDIR =	36	QMAKE_LIBDIR =
37	QMAKE_INCDIR_X11=	37	QMAKE_INCDIR_X11=
38	QMAKE_LIBDIR_X11=	38	QMAKE_LIBDIR_X11=
39	QMAKE_INCDIR_QT = $(QTDIR)/include	39	QMAKE_INCDIR_QT = $(QTDIR)/include
40	QMAKE_LIBDIR_QT = $(QTDIR)/lib	40	QMAKE_LIBDIR_QT = $(QTDIR)/lib
41	QMAKE_INCDIR_OPENGL= /usr/X11R6/include	41	QMAKE_INCDIR_OPENGL= /usr/X11R6/include
42	QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib	42	QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
43		43
44	QMAKE_LINK = arm-linux-gcc	44	QMAKE_LINK = arm-linux-gcc
45	QMAKE_LINK_SHLIB= arm-linux-gcc	45	QMAKE_LINK_SHLIB= arm-linux-gcc
46	QMAKE_LFLAGS = $(LFLAGS_EXTRA)	46	QMAKE_LFLAGS = $(LFLAGS_EXTRA)
47	QMAKE_LFLAGS_RELEASE=	47	QMAKE_LFLAGS_RELEASE=
48	QMAKE_LFLAGS_DEBUG=	48	QMAKE_LFLAGS_DEBUG=
49	QMAKE_LFLAGS_SHLIB = -shared	49	QMAKE_LFLAGS_SHLIB = -shared
50	QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB	50	QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB