Merge remote-tracking branch 'origin/1.2'

Conflicts:
	qbs_version.pri
	share/qbs/modules/cpp/msvc.js
	version.js

Change-Id: Id00deaf66737efd0e35230e2bddd41de1a6de60d

2 files changed, 12 insertions, 1 deletions

diff --git a/tests/auto/api/testdata/infinite-loop-process/main.cpp b/tests/auto/api/testdata/infinite-loop-process/main.cpp
index 26b4e3899..08c24e543 100644
--- a/tests/auto/api/testdata/infinite-loop-process/main.cpp
+++ b/tests/auto/api/testdata/infinite-loop-process/main.cpp
@@ -1,6 +1,12 @@
 #include <QThread>
 
+class MyThread : public QThread
+{
+public:
+    static void mySleep(unsigned long secs) { sleep(secs); } // sleep() is protected in Qt 4.
+};
+
 int main()
 {
-    QThread::sleep(60);
+    MyThread::mySleep(60);
 }
diff --git a/tests/auto/api/testdata/infinite-loop-resolving/project.qbs b/tests/auto/api/testdata/infinite-loop-resolving/project.qbs
new file mode 100644
index 000000000..b690f5041
--- /dev/null
+++ b/tests/auto/api/testdata/infinite-loop-resolving/project.qbs
@@ -0,0 +1,5 @@
+import qbs
+
+Product {
+    type: { while (true); return "Haha!"; }
+}