diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-11 22:22:46 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-11 22:22:47 +0200 |
| commit | 8ed2fcd366caf310e99db982f222bc6ec750c0a7 (patch) | |
| tree | c51cae57da4a87d677145e44ba57765a1e5a3874 /src/corelib/mimetypes/qmimeprovider_p.h | |
| parent | 6918c0a15ba049d7e0de2302846dfadce4866861 (diff) | |
| parent | c12b5e07274acde364be98cd0de620d3a44c97b7 (diff) | |
Merge 5.5 into 5.5.1
Change-Id: I3a78e7228aa21b7c83cf7f07dc6e1c8ad0d0ebff
Diffstat (limited to 'src/corelib/mimetypes/qmimeprovider_p.h')
| -rw-r--r-- | src/corelib/mimetypes/qmimeprovider_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/mimetypes/qmimeprovider_p.h b/src/corelib/mimetypes/qmimeprovider_p.h index eaf95942f7..c0517d69a4 100644 --- a/src/corelib/mimetypes/qmimeprovider_p.h +++ b/src/corelib/mimetypes/qmimeprovider_p.h @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2015 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author David Faure <david.faure@kdab.com> ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. |