qmake,Qt/X11,QtopiaCore: Allow OE to set the tuning options. Allow to add a default module

    -Do not hardcode O2, we have flags in OE to do such things and passing both
     didn't make sense
    -With QtopiaCore QtGui is using Tcp/Udp/Sockets for the QWS implementation. This means when
     building a gui application you will need the network module. Allow to add modules using
     environment variables.

2 files changed, 55 insertions, 35 deletions

diff --git a/packages/qmake/qmake2-native/0001-fix-mkspecs.patch b/packages/qmake/qmake2-native/0001-fix-mkspecs.patch
index abebfdfa27..faf0ba028a 100644
--- a/packages/qmake/qmake2-native/0001-fix-mkspecs.patch
+++ b/packages/qmake/qmake2-native/0001-fix-mkspecs.patch
@@ -1,4 +1,4 @@
-From 594157753a24d0575aaf948dc0e9500f6bdb2178 Mon Sep 17 00:00:00 2001
+From aa0377910cfd8d0fce6bdc9355994a4e267b1696 Mon Sep 17 00:00:00 2001
 From: Michael Krelin <hacker@klever.net>
 Date: Sat, 2 Jun 2007 16:39:58 +0200
 Subject: [PATCH] fix mkspecs
@@ -8,10 +8,10 @@ Subject: [PATCH] fix mkspecs
  mkspecs/common/linux.conf |   26 +++++++++++++-------------
  2 files changed, 22 insertions(+), 22 deletions(-)
 
-diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf
-index f5a5c8e..4007c7e 100644
---- a/mkspecs/common/g++.conf
-+++ b/mkspecs/common/g++.conf
+Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/g++.conf	2007-12-26 02:58:15.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf	2007-12-26 02:58:21.000000000 +0100
 @@ -2,12 +2,12 @@
  # qmake configuration for common gcc
  #
@@ -24,11 +24,11 @@ index f5a5c8e..4007c7e 100644
  QMAKE_CFLAGS_WARN_ON	+= -Wall -W
  QMAKE_CFLAGS_WARN_OFF	+= -w
 -QMAKE_CFLAGS_RELEASE	+= -O2
-+QMAKE_CFLAGS_RELEASE	+= -O2 
++QMAKE_CFLAGS_RELEASE	+= 
  QMAKE_CFLAGS_DEBUG	+= -g
  QMAKE_CFLAGS_SHLIB	+= -fPIC
  QMAKE_CFLAGS_STATIC_LIB	+= -fPIC
-@@ -16,8 +16,8 @@ QMAKE_CFLAGS_HIDESYMS   += -fvisibility=hidden
+@@ -16,8 +16,8 @@
  QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
  QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
  
@@ -39,7 +39,7 @@ index f5a5c8e..4007c7e 100644
  QMAKE_CXXFLAGS_DEPS	+= $$QMAKE_CFLAGS_DEPS
  QMAKE_CXXFLAGS_WARN_ON	+= $$QMAKE_CFLAGS_WARN_ON
  QMAKE_CXXFLAGS_WARN_OFF	+= $$QMAKE_CFLAGS_WARN_OFF
-@@ -30,9 +30,9 @@ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
+@@ -30,9 +30,9 @@
  QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
  QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
  
@@ -52,7 +52,7 @@ index f5a5c8e..4007c7e 100644
  QMAKE_LFLAGS_RELEASE	+=
  QMAKE_LFLAGS_DEBUG	+=
  QMAKE_LFLAGS_APP	+=
-@@ -40,7 +40,7 @@ QMAKE_LFLAGS_SHLIB	+= -shared
+@@ -40,7 +40,7 @@
  QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB
  QMAKE_LFLAGS_SONAME	+= -Wl,-soname,
  QMAKE_LFLAGS_THREAD	+=
@@ -61,11 +61,11 @@ index f5a5c8e..4007c7e 100644
  
  QMAKE_PCH_OUTPUT_EXT    = .gch
  
-diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
-index 3796a87..52acf16 100644
---- a/mkspecs/common/linux.conf
-+++ b/mkspecs/common/linux.conf
-@@ -7,26 +7,26 @@ QMAKE_CXXFLAGS_THREAD	+= $$QMAKE_CFLAGS_THREAD
+Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/linux.conf	2007-12-26 02:58:15.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf	2007-12-26 02:58:21.000000000 +0100
+@@ -7,26 +7,26 @@
  
  QMAKE_INCDIR          =
  QMAKE_LIBDIR          =
@@ -103,7 +103,7 @@ index 3796a87..52acf16 100644
  QMAKE_RANLIB          =
  
  QMAKE_TAR             = tar -cf
-@@ -38,11 +38,11 @@ QMAKE_COPY_DIR        = $(COPY) -r
+@@ -38,11 +38,11 @@
  QMAKE_MOVE            = mv -f
  QMAKE_DEL_FILE        = rm -f
  QMAKE_DEL_DIR         = rmdir
@@ -118,6 +118,16 @@ index 3796a87..52acf16 100644
 -include(unix.conf)
 \ No newline at end of file
 +include(unix.conf)
--- 
-1.5.1.6
-
+Index: qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/linux-g++/qmake.conf	2007-12-26 02:58:15.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf	2007-12-26 03:00:49.000000000 +0100
+@@ -5,7 +5,7 @@
+ MAKEFILE_GENERATOR	= UNIX
+ TEMPLATE		= app
+ CONFIG			+= qt warn_on release incremental link_prl
+-QT			+= core gui
++QT			+= core gui $$(OE_QMAKE_EXTRA_MODULES)
+ QMAKE_INCREMENTAL_STYLE = sublib
+ 
+ include(../common/g++.conf)
diff --git a/packages/qt4/files/0005-fix-mkspecs.patch b/packages/qt4/files/0005-fix-mkspecs.patch
index ab0e4a46d8..faf0ba028a 100644
--- a/packages/qt4/files/0005-fix-mkspecs.patch
+++ b/packages/qt4/files/0005-fix-mkspecs.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] fix mkspecs
  mkspecs/common/linux.conf |   26 +++++++++++++-------------
  2 files changed, 22 insertions(+), 22 deletions(-)
 
-diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf
-index f5a5c8e..4007c7e 100644
---- a/mkspecs/common/g++.conf
-+++ b/mkspecs/common/g++.conf
+Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/g++.conf	2007-12-26 02:58:15.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf	2007-12-26 02:58:21.000000000 +0100
 @@ -2,12 +2,12 @@
  # qmake configuration for common gcc
  #
@@ -24,11 +24,11 @@ index f5a5c8e..4007c7e 100644
  QMAKE_CFLAGS_WARN_ON	+= -Wall -W
  QMAKE_CFLAGS_WARN_OFF	+= -w
 -QMAKE_CFLAGS_RELEASE	+= -O2
-+QMAKE_CFLAGS_RELEASE	+=
++QMAKE_CFLAGS_RELEASE	+= 
  QMAKE_CFLAGS_DEBUG	+= -g
  QMAKE_CFLAGS_SHLIB	+= -fPIC
  QMAKE_CFLAGS_STATIC_LIB	+= -fPIC
-@@ -16,8 +16,8 @@ QMAKE_CFLAGS_HIDESYMS   += -fvisibility=hidden
+@@ -16,8 +16,8 @@
  QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
  QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
  
@@ -39,7 +39,7 @@ index f5a5c8e..4007c7e 100644
  QMAKE_CXXFLAGS_DEPS	+= $$QMAKE_CFLAGS_DEPS
  QMAKE_CXXFLAGS_WARN_ON	+= $$QMAKE_CFLAGS_WARN_ON
  QMAKE_CXXFLAGS_WARN_OFF	+= $$QMAKE_CFLAGS_WARN_OFF
-@@ -30,9 +30,9 @@ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
+@@ -30,9 +30,9 @@
  QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
  QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
  
@@ -52,7 +52,7 @@ index f5a5c8e..4007c7e 100644
  QMAKE_LFLAGS_RELEASE	+=
  QMAKE_LFLAGS_DEBUG	+=
  QMAKE_LFLAGS_APP	+=
-@@ -40,7 +40,7 @@ QMAKE_LFLAGS_SHLIB	+= -shared
+@@ -40,7 +40,7 @@
  QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB
  QMAKE_LFLAGS_SONAME	+= -Wl,-soname,
  QMAKE_LFLAGS_THREAD	+=
@@ -61,11 +61,11 @@ index f5a5c8e..4007c7e 100644
  
  QMAKE_PCH_OUTPUT_EXT    = .gch
  
-diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
-index 3796a87..52acf16 100644
---- a/mkspecs/common/linux.conf
-+++ b/mkspecs/common/linux.conf
-@@ -7,26 +7,26 @@ QMAKE_CXXFLAGS_THREAD	+= $$QMAKE_CFLAGS_THREAD
+Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/linux.conf	2007-12-26 02:58:15.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf	2007-12-26 02:58:21.000000000 +0100
+@@ -7,26 +7,26 @@
  
  QMAKE_INCDIR          =
  QMAKE_LIBDIR          =
@@ -103,7 +103,7 @@ index 3796a87..52acf16 100644
  QMAKE_RANLIB          =
  
  QMAKE_TAR             = tar -cf
-@@ -38,11 +38,11 @@ QMAKE_COPY_DIR        = $(COPY) -r
+@@ -38,11 +38,11 @@
  QMAKE_MOVE            = mv -f
  QMAKE_DEL_FILE        = rm -f
  QMAKE_DEL_DIR         = rmdir
@@ -118,6 +118,16 @@ index 3796a87..52acf16 100644
 -include(unix.conf)
 \ No newline at end of file
 +include(unix.conf)
--- 
-1.5.0.7
-
+Index: qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/linux-g++/qmake.conf	2007-12-26 02:58:15.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf	2007-12-26 03:00:49.000000000 +0100
+@@ -5,7 +5,7 @@
+ MAKEFILE_GENERATOR	= UNIX
+ TEMPLATE		= app
+ CONFIG			+= qt warn_on release incremental link_prl
+-QT			+= core gui
++QT			+= core gui $$(OE_QMAKE_EXTRA_MODULES)
+ QMAKE_INCREMENTAL_STYLE = sublib
+ 
+ include(../common/g++.conf)