Merge remote-tracking branch 'origin/1.5'

Conflicts:
	doc/reference/items/transformer.qdoc
	share/qbs/modules/cpp/GenericGCC.qbs

Change-Id: I45560834560019b18274c373c45651eb8aadd206

33 files changed, 33 insertions, 33 deletions

diff --git a/examples/app-and-lib/app/app.qbs b/examples/app-and-lib/app/app.qbs
index 3268a13d5..ebc169753 100644
--- a/examples/app-and-lib/app/app.qbs
+++ b/examples/app-and-lib/app/app.qbs
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the examples of the Qt Build Suite.
+** This file is part of the examples of Qbs.
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
diff --git a/examples/app-and-lib/app/main.cpp b/examples/app-and-lib/app/main.cpp
index 8f7f6acd1..ce72b001d 100644
--- a/examples/app-and-lib/app/main.cpp
+++ b/examples/app-and-lib/app/main.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the Qt Build Suite.
+** This file is part of Qbs.
 **
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
diff --git a/examples/app-and-lib/app_and_lib.qbs b/examples/app-and-lib/app_and_lib.qbs
index c2effa8d0..e214055b5 100644
--- a/examples/app-and-lib/app_and_lib.qbs
+++ b/examples/app-and-lib/app_and_lib.qbs
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the examples of the Qt Build Suite.
+** This file is part of the examples of Qbs.
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
diff --git a/examples/app-and-lib/lib/lib.cpp b/examples/app-and-lib/lib/lib.cpp
index 88a7c3139..ecc2ba42f 100644
--- a/examples/app-and-lib/lib/lib.cpp
+++ b/examples/app-and-lib/lib/lib.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the Qt Build Suite.
+** This file is part of Qbs.
 **
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
diff --git a/examples/app-and-lib/lib/lib.qbs b/examples/app-and-lib/lib/lib.qbs
index 55417e0ef..0e6679e78 100644
--- a/examples/app-and-lib/lib/lib.qbs
+++ b/examples/app-and-lib/lib/lib.qbs
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the examples of the Qt Build Suite.
+** This file is part of the examples of Qbs.
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
diff --git a/examples/cocoa-application/CocoaApplication.qbs b/examples/cocoa-application/CocoaApplication.qbs
index 3a86dba48..a04acfb6b 100644
--- a/examples/cocoa-application/CocoaApplication.qbs
+++ b/examples/cocoa-application/CocoaApplication.qbs
@@ -4,7 +4,7 @@
 ** Copyright (C) 2015 Petroules Corporation.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the examples of the Qt Build Suite.
+** This file is part of the examples of Qbs.
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
diff --git a/examples/cocoa-application/CocoaApplication/AppDelegate.h b/examples/cocoa-application/CocoaApplication/AppDelegate.h
index 75f193469..a6c715c5b 100644
--- a/examples/cocoa-application/CocoaApplication/AppDelegate.h
+++ b/examples/cocoa-application/CocoaApplication/AppDelegate.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 Petroules Corporation.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the Qt Build Suite.
+** This file is part of Qbs.
 **
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
diff --git a/examples/cocoa-application/CocoaApplication/AppDelegate.m b/examples/cocoa-application/CocoaApplication/AppDelegate.m
index a69a96975..8fd5c49c9 100644
--- a/examples/cocoa-application/CocoaApplication/AppDelegate.m
+++ b/examples/cocoa-application/CocoaApplication/AppDelegate.m
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 Petroules Corporation.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the Qt Build Suite.
+** This file is part of Qbs.
 **
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
diff --git a/examples/cocoa-application/CocoaApplication/CocoaApplication-Prefix.pch b/examples/cocoa-application/CocoaApplication/CocoaApplication-Prefix.pch
index af4d61585..d7206045a 100644
--- a/examples/cocoa-application/CocoaApplication/CocoaApplication-Prefix.pch
+++ b/examples/cocoa-application/CocoaApplication/CocoaApplication-Prefix.pch
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 Petroules Corporation.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the Qt Build Suite.
+** This file is part of Qbs.
 **
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
diff --git a/examples/cocoa-application/CocoaApplication/main.m b/examples/cocoa-application/CocoaApplication/main.m
index 6150f272e..18b23e7ad 100644
--- a/examples/cocoa-application/CocoaApplication/main.m
+++ b/examples/cocoa-application/CocoaApplication/main.m
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 Petroules Corporation.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the Qt Build Suite.
+** This file is part of Qbs.
 **
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
diff --git a/examples/cocoa-touch-application/CocoaTouchApplication.qbs b/examples/cocoa-touch-application/CocoaTouchApplication.qbs
index c92d5332a..4e09f81ca 100644
--- a/examples/cocoa-touch-application/CocoaTouchApplication.qbs
+++ b/examples/cocoa-touch-application/CocoaTouchApplication.qbs
@@ -4,7 +4,7 @@
 ** Copyright (C) 2015 Petroules Corporation.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the examples of the Qt Build Suite.
+** This file is part of the examples of Qbs.
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
diff --git a/examples/cocoa-touch-application/CocoaTouchApplication/AppDelegate.h b/examples/cocoa-touch-application/CocoaTouchApplication/AppDelegate.h
index 05c78e7d1..cc30687c8 100644
--- a/examples/cocoa-touch-application/CocoaTouchApplication/AppDelegate.h
+++ b/examples/cocoa-touch-application/CocoaTouchApplication/AppDelegate.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 Petroules Corporation.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the Qt Build Suite.
+** This file is part of Qbs.
 **
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
diff --git a/examples/cocoa-touch-application/CocoaTouchApplication/AppDelegate.m b/examples/cocoa-touch-application/CocoaTouchApplication/AppDelegate.m
index 35f6ec7f3..ed4d9f310 100644
--- a/examples/cocoa-touch-application/CocoaTouchApplication/AppDelegate.m
+++ b/examples/cocoa-touch-application/CocoaTouchApplication/AppDelegate.m
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 Petroules Corporation.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the Qt Build Suite.
+** This file is part of Qbs.
 **
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
diff --git a/examples/cocoa-touch-application/CocoaTouchApplication/CocoaTouchApplication-Prefix.pch b/examples/cocoa-touch-application/CocoaTouchApplication/CocoaTouchApplication-Prefix.pch
index a9b185069..6a90a06f9 100644
--- a/examples/cocoa-touch-application/CocoaTouchApplication/CocoaTouchApplication-Prefix.pch
+++ b/examples/cocoa-touch-application/CocoaTouchApplication/CocoaTouchApplication-Prefix.pch
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 Petroules Corporation.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the Qt Build Suite.
+** This file is part of Qbs.
 **
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
diff --git a/examples/cocoa-touch-application/CocoaTouchApplication/DetailViewController.h b/examples/cocoa-touch-application/CocoaTouchApplication/DetailViewController.h
index 584729e7f..728393ff4 100644
--- a/examples/cocoa-touch-application/CocoaTouchApplication/DetailViewController.h
+++ b/examples/cocoa-touch-application/CocoaTouchApplication/DetailViewController.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 Petroules Corporation.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the Qt Build Suite.
+** This file is part of Qbs.
 **
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
diff --git a/examples/cocoa-touch-application/CocoaTouchApplication/DetailViewController.m b/examples/cocoa-touch-application/CocoaTouchApplication/DetailViewController.m
index 8d72aea2e..85a5d6ddb 100644
--- a/examples/cocoa-touch-application/CocoaTouchApplication/DetailViewController.m
+++ b/examples/cocoa-touch-application/CocoaTouchApplication/DetailViewController.m
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 Petroules Corporation.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the Qt Build Suite.
+** This file is part of Qbs.
 **
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
diff --git a/examples/cocoa-touch-application/CocoaTouchApplication/MasterViewController.h b/examples/cocoa-touch-application/CocoaTouchApplication/MasterViewController.h
index 41d7a7211..9348b4e1f 100644
--- a/examples/cocoa-touch-application/CocoaTouchApplication/MasterViewController.h
+++ b/examples/cocoa-touch-application/CocoaTouchApplication/MasterViewController.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 Petroules Corporation.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the Qt Build Suite.
+** This file is part of Qbs.
 **
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
diff --git a/examples/cocoa-touch-application/CocoaTouchApplication/MasterViewController.m b/examples/cocoa-touch-application/CocoaTouchApplication/MasterViewController.m
index 6d2b3b68a..6024d67c4 100644
--- a/examples/cocoa-touch-application/CocoaTouchApplication/MasterViewController.m
+++ b/examples/cocoa-touch-application/CocoaTouchApplication/MasterViewController.m
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 Petroules Corporation.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the Qt Build Suite.
+** This file is part of Qbs.
 **
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
diff --git a/examples/cocoa-touch-application/CocoaTouchApplication/main.m b/examples/cocoa-touch-application/CocoaTouchApplication/main.m
index a8512ef0e..7665efcf1 100644
--- a/examples/cocoa-touch-application/CocoaTouchApplication/main.m
+++ b/examples/cocoa-touch-application/CocoaTouchApplication/main.m
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 Petroules Corporation.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the Qt Build Suite.
+** This file is part of Qbs.
 **
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
diff --git a/examples/code-generator/code-generator.qbs b/examples/code-generator/code-generator.qbs
index a8a804be2..572bebd06 100644
--- a/examples/code-generator/code-generator.qbs
+++ b/examples/code-generator/code-generator.qbs
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the examples of the Qt Build Suite.
+** This file is part of the examples of Qbs.
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
diff --git a/examples/collidingmice/collidingmice.qbs b/examples/collidingmice/collidingmice.qbs
index 8d4edd04e..9be12f53e 100644
--- a/examples/collidingmice/collidingmice.qbs
+++ b/examples/collidingmice/collidingmice.qbs
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the examples of the Qt Build Suite.
+** This file is part of the examples of Qbs.
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
diff --git a/examples/collidingmice/main.cpp b/examples/collidingmice/main.cpp
index 0abfc6899..3873be610 100644
--- a/examples/collidingmice/main.cpp
+++ b/examples/collidingmice/main.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the Qt Build Suite.
+** This file is part of Qbs.
 **
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
diff --git a/examples/collidingmice/mouse.cpp b/examples/collidingmice/mouse.cpp
index dd20409b8..49a829f87 100644
--- a/examples/collidingmice/mouse.cpp
+++ b/examples/collidingmice/mouse.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the Qt Build Suite.
+** This file is part of Qbs.
 **
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
diff --git a/examples/collidingmice/mouse.h b/examples/collidingmice/mouse.h
index 41c02c98f..c8a0948de 100644
--- a/examples/collidingmice/mouse.h
+++ b/examples/collidingmice/mouse.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the Qt Build Suite.
+** This file is part of Qbs.
 **
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
diff --git a/examples/examples.qbs b/examples/examples.qbs
index dd583aa99..565b1703a 100644
--- a/examples/examples.qbs
+++ b/examples/examples.qbs
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the examples of the Qt Build Suite.
+** This file is part of the examples of Qbs.
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
diff --git a/examples/helloworld-complex/hello.qbs b/examples/helloworld-complex/hello.qbs
index d950307ea..a9f7b8fee 100644
--- a/examples/helloworld-complex/hello.qbs
+++ b/examples/helloworld-complex/hello.qbs
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the examples of the Qt Build Suite.
+** This file is part of the examples of Qbs.
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
diff --git a/examples/helloworld-complex/src/foo.cpp b/examples/helloworld-complex/src/foo.cpp
index 47adf2cc5..fd7aedd71 100644
--- a/examples/helloworld-complex/src/foo.cpp
+++ b/examples/helloworld-complex/src/foo.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the examples of the Qt Build Suite.
+** This file is part of the examples of Qbs.
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
diff --git a/examples/helloworld-complex/src/main.cpp b/examples/helloworld-complex/src/main.cpp
index b139f0a63..32785aec5 100644
--- a/examples/helloworld-complex/src/main.cpp
+++ b/examples/helloworld-complex/src/main.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the examples of the Qt Build Suite.
+** This file is part of the examples of Qbs.
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
diff --git a/examples/helloworld-complex/src/specialfeature.cpp b/examples/helloworld-complex/src/specialfeature.cpp
index af2f92919..d74e1dd52 100644
--- a/examples/helloworld-complex/src/specialfeature.cpp
+++ b/examples/helloworld-complex/src/specialfeature.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the examples of the Qt Build Suite.
+** This file is part of the examples of Qbs.
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
diff --git a/examples/helloworld-minimal/hello.qbs b/examples/helloworld-minimal/hello.qbs
index 8d5812526..aa5399780 100644
--- a/examples/helloworld-minimal/hello.qbs
+++ b/examples/helloworld-minimal/hello.qbs
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the examples of the Qt Build Suite.
+** This file is part of the examples of Qbs.
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
diff --git a/examples/helloworld-minimal/main.cpp b/examples/helloworld-minimal/main.cpp
index 7eff9b2d6..493e202b8 100644
--- a/examples/helloworld-minimal/main.cpp
+++ b/examples/helloworld-minimal/main.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the examples of the Qt Build Suite.
+** This file is part of the examples of Qbs.
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
diff --git a/examples/helloworld-qt/hello.qbs b/examples/helloworld-qt/hello.qbs
index 66fcd588f..de58d3a86 100644
--- a/examples/helloworld-qt/hello.qbs
+++ b/examples/helloworld-qt/hello.qbs
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the examples of the Qt Build Suite.
+** This file is part of the examples of Qbs.
 **
 ** You may use this file under the terms of the BSD license as follows:
 **
diff --git a/examples/helloworld-qt/main.cpp b/examples/helloworld-qt/main.cpp
index 7fd93630a..d912b1c6d 100644
--- a/examples/helloworld-qt/main.cpp
+++ b/examples/helloworld-qt/main.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing
 **
-** This file is part of the examples of the Qt Build Suite.
+** This file is part of the examples of Qbs.
 **
 ** You may use this file under the terms of the BSD license as follows:
 **