Merge remote branch 'qt/master' into file-engine-refactor

Conflicts:
	demos/declarative/minehunt/minehunt.pro
	src/corelib/io/io.pri
	src/corelib/io/qfsfileengine.cpp
	src/corelib/io/qfsfileengine_unix.cpp
	src/corelib/io/qfsfileengine_win.cpp
	src/s60installs/bwins/QtCoreu.def
	src/s60installs/bwins/QtDeclarativeu.def
	src/s60installs/bwins/QtGuiu.def
	src/s60installs/eabi/QtCoreu.def
	src/s60installs/eabi/QtDeclarativeu.def
	src/s60installs/eabi/QtGuiu.def
	tests/auto/qapplication/test/test.pro
	tests/auto/qaudioinput/qaudioinput.pro
	tests/auto/qaudiooutput/qaudiooutput.pro
	tests/auto/qchar/qchar.pro
	tests/auto/qdiriterator/qdiriterator.pro
	tests/auto/qsound/qsound.pro

2 files changed, 66 insertions, 0 deletions

diff --git a/tests/manual/mkspecs/.gitignore b/tests/manual/mkspecs/.gitignore
new file mode 100644
index 0000000..403e028
--- /dev/null
+++ b/tests/manual/mkspecs/.gitignore
@@ -0,0 +1,2 @@
+tmp
+specs
diff --git a/tests/manual/mkspecs/test.sh b/tests/manual/mkspecs/test.sh
new file mode 100755
index 0000000..4b723c0
--- /dev/null
+++ b/tests/manual/mkspecs/test.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+
+if [ "$1" == "--help" ]; then
+    echo "Init a clean git repository somewhere and run this test script from that directory. The first run will"
+    echo "produce a bunch of specs. This is your baseline. Run 'git add specs' and commit the baseline. Then run"
+    echo "this script again, after making changes to the mkspecs. You should see any diffs you produced."
+    exit 0
+fi
+
+
+QMAKE_ARGS="-nocache -d"
+SPECS_DIR=$(qmake -query QMAKE_MKSPECS)
+SPECS=$(find -L $SPECS_DIR | grep "qmake.conf" | grep -Ev "common|default" | grep "$1")
+
+SEDI="sed -i"
+if [ $(uname) == "Darwin" ]; then
+    # Mac OS X requires an extension, Linux will barf on it being present
+    SEDI='sed -i .backup'
+fi
+
+if [ ! -d tmp ]; then
+    mkdir tmp
+    touch tmp/empty.pro
+fi
+
+if [ ! -d specs ]; then
+    mkdir specs
+fi
+
+git checkout -- specs > /dev/null 2>&1
+
+cd tmp
+for spec in $SPECS; do
+    spec=$(echo $spec | sed "s|$SPECS_DIR/||" | sed "s|/qmake.conf||")
+    output_file=$(echo "$spec.txt" | sed "s|/|-|g")
+    echo "Dumping qmake variables for spec '$spec' to 'specs/$output_file'..."
+    qmake $QMAKE_ARGS -spec $spec empty.pro 2>&1 |
+        sed -n '/Dumping all variables/,$p' |
+        grep -Ev "(QMAKE_INTERNAL_INCLUDED_FILES|DISTFILES) ===" > ../specs/$output_file
+
+    if [ -n $QTDIR ]; then
+        $SEDI "s|$QTDIR|\$QTDIR|g" ../specs/$output_file
+    fi
+
+    if [ -n $QTSRCDIR ]; then
+        $SEDI "s|$QTSRCDIR|\$QTDIR|g" ../specs/$output_file
+    fi
+done
+cd ..
+
+rm -f specs/*.backup
+
+git diff --exit-code -- specs > /dev/null
+exit_code=$?
+
+if [ $exit_code -eq 0 ]; then
+    echo -e "\nNo diff produced (you did good)"
+else
+    # Show the resulting diff
+    git diff -- specs
+fi
+
+exit $exit_code
+