From d2a52072c7f0220d7abf0f73102cc5db616527b2 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Fri, 10 Dec 2010 09:51:49 +0100
Subject: Remove superfluous OpenGL linking for QtDeclarative

---
 src/declarative/declarative.pro | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
index 93ad861..1ad888b 100644
--- a/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@ -2,7 +2,6 @@ TARGET     = QtDeclarative
 QPRO_PWD   = $$PWD
 QT         = core gui script network
 contains(QT_CONFIG, svg): QT += svg
-contains(QT_CONFIG, opengl): QT += opengl
 DEFINES   += QT_BUILD_DECLARATIVE_LIB QT_NO_URL_CAST_FROM_STRING
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
-- 
cgit v0.12


From 0e04bd14bb422d7098f859a3b904fcf4d05aa458 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Fri, 10 Dec 2010 09:56:18 +0100
Subject: Don't include <features.h> directly: non-standard header.

It's completely wrong to assume that any Linux has
features.h. Instead, include something that comes from the libc (like
stdlib.h, which is specified by ISO C 89) and hope that __GLIBC__ gets
defined.

Specifically don't do this to stddef.h as that one comes from the
compiler.

Reviewed-by: Andreas Kling
---
 src/corelib/global/qendian.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h
index d53504a..08415bf 100644
--- a/src/corelib/global/qendian.h
+++ b/src/corelib/global/qendian.h
@@ -44,9 +44,8 @@
 
 #include <QtCore/qglobal.h>
 
-#ifdef Q_OS_LINUX
-# include <features.h>
-#endif
+// include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
+#include <stdlib.h>
 
 #ifdef __GLIBC__
 #include <byteswap.h>
-- 
cgit v0.12


From 7b631a55c44520ca114f7e20a87a66c69e57a39e Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 6 Dec 2010 16:41:40 +0100
Subject: fix nonsense condition

checking the stdout of a grep redirected to /dev/null is rather
pointless. also, this code had a syntax error ...
---
 configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 86c14dd..99d460b 100755
--- a/configure
+++ b/configure
@@ -8597,7 +8597,8 @@ for file in .projects .projects.3; do
         *winmain/winmain.pro)
             [ "$XPLATFORM_MINGW" = "yes" ] || continue
             SPEC=$XQMAKESPEC ;;
-        *s60main/s60main.pro) if [ "$CFG_NOPROCESS" = "yes" ] || [ -z "`echo "$XPLATFORM" | grep "symbian" >/dev/null`"]; then
+        *s60main/s60main.pro)
+            if [ "$CFG_NOPROCESS" = "yes" ] || ! echo "$XPLATFORM" | grep "symbian" >/dev/null; then
                 continue
             fi;;
         *examples/activeqt/*) continue ;;
-- 
cgit v0.12


From 6cf07024bfbf795b8c7ddf807668a2255c7b2985 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 6 Dec 2010 16:46:58 +0100
Subject: fix -dont-process for mingw cross-build

---
 configure | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 99d460b..7141880 100755
--- a/configure
+++ b/configure
@@ -8595,7 +8595,9 @@ for file in .projects .projects.3; do
 
         case $a in
         *winmain/winmain.pro)
-            [ "$XPLATFORM_MINGW" = "yes" ] || continue
+            if [ "$CFG_NOPROCESS" = "yes" ] || [ "$XPLATFORM_MINGW" != "yes" ]; then
+                continue
+            fi
             SPEC=$XQMAKESPEC ;;
         *s60main/s60main.pro)
             if [ "$CFG_NOPROCESS" = "yes" ] || ! echo "$XPLATFORM" | grep "symbian" >/dev/null; then
-- 
cgit v0.12


From 58334dcd3bf7c65ff910f4b00f356aa5944f2c82 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 10 Dec 2010 14:12:44 +0100
Subject: fix path separator matching

use QDir::separator() instead of Option::dir_sep in localOS context.
---
 qmake/project.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qmake/project.cpp b/qmake/project.cpp
index d967a63..bd81b17 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -2173,7 +2173,7 @@ QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list,
             const QRegExp regex(r, Qt::CaseSensitive, QRegExp::Wildcard);
             for(int d = 0; d < dirs.count(); d++) {
                 QString dir = dirs[d];
-                if(!dir.isEmpty() && !dir.endsWith(Option::dir_sep))
+                if(!dir.isEmpty() && !dir.endsWith(QDir::separator()))
                     dir += "/";
 
                 QDir qdir(dir);
@@ -2389,7 +2389,7 @@ QMakeProject::doProjectTest(QString func, QList<QStringList> args_list, QMap<QSt
             return true;
         //regular expression I guess
         QString dirstr = qmake_getpwd();
-        int slsh = file.lastIndexOf(Option::dir_sep);
+        int slsh = file.lastIndexOf(QDir::separator());
         if(slsh != -1) {
             dirstr = file.left(slsh+1);
             file = file.right(file.length() - slsh - 1);
-- 
cgit v0.12