summaryrefslogtreecommitdiffstats
path: root/examples/positioning/geoflickr/qmllocationflickr.cpp
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2017-09-28 13:45:29 +0200
committerKai Koehne <kai.koehne@qt.io>2017-10-17 11:17:44 +0000
commite9a42b7cfcbc5fc8a544d57a71316b922aeda271 (patch)
tree242330ffc3a68b8f6151396010d6070b5a7f93f6 /examples/positioning/geoflickr/qmllocationflickr.cpp
parent61b83515b7d45908ac9276b312539bf7eea47ba5 (diff)
Fix outdated BSD license header
Use new version with commercial exception. Change-Id: I11058c94138615f7df2f99b6c3245ab075cd8222 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'examples/positioning/geoflickr/qmllocationflickr.cpp')
-rw-r--r--examples/positioning/geoflickr/qmllocationflickr.cpp16
1 files changed, 13 insertions, 3 deletions
diff --git a/examples/positioning/geoflickr/qmllocationflickr.cpp b/examples/positioning/geoflickr/qmllocationflickr.cpp
index 2ad9ce6d..61176cb1 100644
--- a/examples/positioning/geoflickr/qmllocationflickr.cpp
+++ b/examples/positioning/geoflickr/qmllocationflickr.cpp
@@ -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