Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3

 Conflicts:
	.qmake.conf

Change-Id: I9a3d7ec0bb203ac8b5bd483af3973510ca33c4a9

1 files changed, 13 insertions, 3 deletions

diff --git a/examples/location/places/forms/MessageForm.ui.qml b/examples/location/places/forms/MessageForm.ui.qml
index a3008413..cff76c07 100644
--- a/examples/location/places/forms/MessageForm.ui.qml
+++ b/examples/location/places/forms/MessageForm.ui.qml
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are