summaryrefslogtreecommitdiff
path: root/examples/xmlpatterns/filetree/mainwindow.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-10-30 08:46:45 +0100
committerLiang Qi <liang.qi@qt.io>2017-10-30 09:56:44 +0100
commit40a50c0c585eaa838261742e33a547e09d4040d6 (patch)
treefc3e9933f4d0b0bbd6c31f3530d86b2caef93cdb /examples/xmlpatterns/filetree/mainwindow.cpp
parent9e26cfa167778f3d9444aedcb23c8476683b3785 (diff)
parentb257f032350c555ea52a7dad5a52d0312ab93b5c (diff)
downloadqtxmlpatterns-40a50c0c585eaa838261742e33a547e09d4040d6.tar.gz
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4
Conflicts: .qmake.conf Change-Id: I03793037d5cb382a3ea411286633903e4fee60ce
Diffstat (limited to 'examples/xmlpatterns/filetree/mainwindow.cpp')
-rw-r--r--examples/xmlpatterns/filetree/mainwindow.cpp16
1 files changed, 13 insertions, 3 deletions
diff --git a/examples/xmlpatterns/filetree/mainwindow.cpp b/examples/xmlpatterns/filetree/mainwindow.cpp
index f8f8d52..3dc42b5 100644
--- a/examples/xmlpatterns/filetree/mainwindow.cpp
+++ b/examples/xmlpatterns/filetree/mainwindow.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