Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt

Conflicts:
	configure.exe
	src/network/access/qhttpnetworkconnection_p.h
	tests/auto/qstyle/qstyle.pro
	tests/auto/qstyle/tst_qstyle.cpp
	tools/configure/configureapp.cpp

configure.exe will be recompiled in next commit. Took ours.

1 files changed, 22 insertions, 0 deletions

diff --git a/tests/auto/linguist/lupdate/testdata/recursivescan/main.cpp b/tests/auto/linguist/lupdate/testdata/recursivescan/main.cpp
new file mode 100644
index 0000000..905cccd
--- /dev/null
+++ b/tests/auto/linguist/lupdate/testdata/recursivescan/main.cpp
@@ -0,0 +1,22 @@
+#include <QApplication>
+#include <QDebug>
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    QTranslator translator;
+    translator.load("whitespace");
+    app.installTranslator(&translator);
+
+    QObject::tr("\nnewline at the start");
+    QObject::tr("newline at the end\n");
+    QObject::tr("newline and space at the end\n ");
+    QObject::tr("space and newline at the end \n");
+    QObject::tr("\tTab at the start and newline at the end\n");
+    QObject::tr("\n\tnewline and tab at the start");
+    QObject::tr(" \tspace and tab at the start");
+    QObject::tr(" space_first");
+    QObject::tr("space_last ");
+    return app.exec();
+}