summaryrefslogtreecommitdiffstats
path: root/src/widgets/dialogs/qfiledialog.ui
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-02-23 11:24:04 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-02-23 11:24:07 +0100
commitd34353a065c443aac20376cbd88323480d769183 (patch)
treeda5d86b51c2cf7023356551c4c980849b35bab14 /src/widgets/dialogs/qfiledialog.ui
parent4e40b1952695f0b1086ef7b88e8514bd18cf96bf (diff)
parent571908f7fc8f5e4ef9a4dfd90102566f6f0fcad2 (diff)
Merge dev into 5.5
Diffstat (limited to 'src/widgets/dialogs/qfiledialog.ui')
-rw-r--r--src/widgets/dialogs/qfiledialog.ui2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/dialogs/qfiledialog.ui b/src/widgets/dialogs/qfiledialog.ui
index cc633cab3f..7bbfb0a10b 100644
--- a/src/widgets/dialogs/qfiledialog.ui
+++ b/src/widgets/dialogs/qfiledialog.ui
@@ -2,7 +2,7 @@
<ui version="4.0">
<comment>*********************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the QtWidgets module of the Qt Toolkit.