From: Matthieu Gallien Date: Tue, 16 May 2023 14:48:30 +0000 (+0200) Subject: add missing copyright notices and upgrade qml module imports X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~10^2~42^2~21 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=dc66a1254dc4365841050ca0ad27396624ab8e3d;p=nextcloud-desktop.git add missing copyright notices and upgrade qml module imports Signed-off-by: Matthieu Gallien --- diff --git a/src/gui/BasicComboBox.qml b/src/gui/BasicComboBox.qml index 1c184c9e9..3437a0a57 100644 --- a/src/gui/BasicComboBox.qml +++ b/src/gui/BasicComboBox.qml @@ -1,5 +1,5 @@ /* - * Copyright (C) by Claudio Cambra + * Copyright (C) 2022 by Claudio Cambra * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 import QtQuick.Controls 2.15 -import QtGraphicalEffects 1.0 +import QtGraphicalEffects 1.15 import Style 1.0 import "./tray" diff --git a/src/gui/ErrorBox.qml b/src/gui/ErrorBox.qml index 2a84c130e..a90c9a0c5 100644 --- a/src/gui/ErrorBox.qml +++ b/src/gui/ErrorBox.qml @@ -1,3 +1,17 @@ +/* + * Copyright (C) 2021 by Felix Weilbach + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + import QtQuick 2.15 import QtQuick.Layouts 1.15 import QtQuick.Controls 2.15 diff --git a/src/gui/tray/ActivityItemActions.qml b/src/gui/tray/ActivityItemActions.qml index 908aab9d6..fe9781702 100644 --- a/src/gui/tray/ActivityItemActions.qml +++ b/src/gui/tray/ActivityItemActions.qml @@ -1,7 +1,7 @@ import QtQml 2.15 import QtQuick 2.15 -import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.2 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 import Style 1.0 import com.nextcloud.desktopclient 1.0 diff --git a/src/gui/tray/ActivityItemContent.qml b/src/gui/tray/ActivityItemContent.qml index 88caedaea..ae5345912 100644 --- a/src/gui/tray/ActivityItemContent.qml +++ b/src/gui/tray/ActivityItemContent.qml @@ -1,9 +1,9 @@ import QtQml 2.15 import QtQuick 2.15 -import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.2 -import Style 1.0 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 import QtGraphicalEffects 1.15 +import Style 1.0 import com.nextcloud.desktopclient 1.0 RowLayout { diff --git a/src/gui/tray/ActivityItemContextMenu.qml b/src/gui/tray/ActivityItemContextMenu.qml index de35e3584..acbe7ee82 100644 --- a/src/gui/tray/ActivityItemContextMenu.qml +++ b/src/gui/tray/ActivityItemContextMenu.qml @@ -1,6 +1,6 @@ import QtQml 2.15 import QtQuick 2.15 -import QtQuick.Controls 2.3 +import QtQuick.Controls 2.15 import Style 1.0 AutoSizingMenu { diff --git a/src/gui/tray/ActivityList.qml b/src/gui/tray/ActivityList.qml index 995d225b2..0f690ca27 100644 --- a/src/gui/tray/ActivityList.qml +++ b/src/gui/tray/ActivityList.qml @@ -3,7 +3,6 @@ import QtQuick.Controls 2.15 import Style 1.0 import com.nextcloud.desktopclient 1.0 as NC -import Style 1.0 ScrollView { id: controlRoot diff --git a/src/gui/tray/CustomButton.qml b/src/gui/tray/CustomButton.qml index c21ab16eb..69050b541 100644 --- a/src/gui/tray/CustomButton.qml +++ b/src/gui/tray/CustomButton.qml @@ -1,6 +1,20 @@ +/* + * Copyright (C) 2022 by Oleksandr Zolotov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + import QtQuick 2.15 -import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.2 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 import Style 1.0 Button { diff --git a/src/gui/tray/HeaderButton.qml b/src/gui/tray/HeaderButton.qml index f2528c10b..43ac7e14d 100644 --- a/src/gui/tray/HeaderButton.qml +++ b/src/gui/tray/HeaderButton.qml @@ -1,10 +1,24 @@ -import QtQml 2.1 -import QtQml.Models 2.1 -import QtQuick 2.9 -import QtQuick.Window 2.3 -import QtQuick.Controls 2.2 -import QtQuick.Layouts 1.2 -import QtGraphicalEffects 1.0 +/* + * Copyright (C) 2020 by Nicolas Fella + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + +import QtQml 2.15 +import QtQml.Models 2.15 +import QtQuick 2.15 +import QtQuick.Window 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 +import QtGraphicalEffects 1.15 // Custom qml modules are in /theme (and included by resources.qrc) import Style 1.0 diff --git a/src/gui/tray/UnifiedSearchInputContainer.qml b/src/gui/tray/UnifiedSearchInputContainer.qml index 6dc0e17a7..6fd92ecad 100644 --- a/src/gui/tray/UnifiedSearchInputContainer.qml +++ b/src/gui/tray/UnifiedSearchInputContainer.qml @@ -1,7 +1,21 @@ +/* + * Copyright (C) 2021 by Oleksandr Zolotov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + import QtQml 2.15 import QtQuick 2.15 -import QtQuick.Controls 2.3 -import QtGraphicalEffects 1.0 +import QtQuick.Controls 2.15 +import QtGraphicalEffects 1.15 import Style 1.0 import com.nextcloud.desktopclient 1.0 diff --git a/src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml b/src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml index 51b88718b..642129ccc 100644 --- a/src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml +++ b/src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml @@ -1,7 +1,21 @@ +/* + * Copyright (C) 2021 by Oleksandr Zolotov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + import QtQml 2.15 import QtQuick 2.15 -import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.2 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 import Style 1.0 ColumnLayout { diff --git a/src/gui/tray/UnifiedSearchResultItem.qml b/src/gui/tray/UnifiedSearchResultItem.qml index 3a3c2edfd..eed8bf22d 100644 --- a/src/gui/tray/UnifiedSearchResultItem.qml +++ b/src/gui/tray/UnifiedSearchResultItem.qml @@ -1,8 +1,22 @@ +/* + * Copyright (C) 2021 by Oleksandr Zolotov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + import QtQml 2.15 -import QtQuick 2.9 -import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.2 -import QtGraphicalEffects 1.0 +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 +import QtGraphicalEffects 1.15 import Style 1.0 diff --git a/src/gui/tray/UnifiedSearchResultItemSkeleton.qml b/src/gui/tray/UnifiedSearchResultItemSkeleton.qml index a5d845752..b956df9d8 100644 --- a/src/gui/tray/UnifiedSearchResultItemSkeleton.qml +++ b/src/gui/tray/UnifiedSearchResultItemSkeleton.qml @@ -1,6 +1,20 @@ +/* + * Copyright (C) 2021 by Oleksandr Zolotov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + import QtQml 2.15 import QtQuick 2.15 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.15 import QtGraphicalEffects 1.15 import Style 1.0 diff --git a/src/gui/tray/UnifiedSearchResultItemSkeletonContainer.qml b/src/gui/tray/UnifiedSearchResultItemSkeletonContainer.qml index 6855cd622..03e661364 100644 --- a/src/gui/tray/UnifiedSearchResultItemSkeletonContainer.qml +++ b/src/gui/tray/UnifiedSearchResultItemSkeletonContainer.qml @@ -1,3 +1,17 @@ +/* + * Copyright (C) 2021 by Oleksandr Zolotov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + import QtQml 2.15 import QtQuick 2.15 import QtQuick.Layouts 1.15 diff --git a/src/gui/tray/UnifiedSearchResultListItem.qml b/src/gui/tray/UnifiedSearchResultListItem.qml index be622fbaa..2c27c0fb9 100644 --- a/src/gui/tray/UnifiedSearchResultListItem.qml +++ b/src/gui/tray/UnifiedSearchResultListItem.qml @@ -1,6 +1,20 @@ +/* + * Copyright (C) 2021 by Oleksandr Zolotov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + import QtQml 2.15 import QtQuick 2.15 -import QtQuick.Controls 2.3 +import QtQuick.Controls 2.15 import Style 1.0 import com.nextcloud.desktopclient 1.0 diff --git a/src/gui/tray/UnifiedSearchResultNothingFound.qml b/src/gui/tray/UnifiedSearchResultNothingFound.qml index 5ceb1e5e7..d1ff10bdf 100644 --- a/src/gui/tray/UnifiedSearchResultNothingFound.qml +++ b/src/gui/tray/UnifiedSearchResultNothingFound.qml @@ -1,7 +1,21 @@ +/* + * Copyright (C) 2021 by Oleksandr Zolotov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + import QtQml 2.15 import QtQuick 2.15 -import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.2 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 import Style 1.0 ColumnLayout { diff --git a/src/gui/tray/UnifiedSearchResultSectionItem.qml b/src/gui/tray/UnifiedSearchResultSectionItem.qml index 27ad780ed..1637424f7 100644 --- a/src/gui/tray/UnifiedSearchResultSectionItem.qml +++ b/src/gui/tray/UnifiedSearchResultSectionItem.qml @@ -1,7 +1,21 @@ +/* + * Copyright (C) 2021 by Oleksandr Zolotov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + import QtQml 2.15 import QtQuick 2.15 import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.15 import Style 1.0 import com.nextcloud.desktopclient 1.0 diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml index 1292ea4a4..8000bfe81 100644 --- a/src/gui/tray/UserLine.qml +++ b/src/gui/tray/UserLine.qml @@ -1,7 +1,21 @@ -import QtQuick 2.9 -import QtQuick.Window 2.3 -import QtQuick.Controls 2.2 -import QtQuick.Layouts 1.2 +/* + * Copyright (C) 2019 by Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + +import QtQuick 2.15 +import QtQuick.Window 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 // Custom qml modules are in /theme (and included by resources.qrc) import Style 1.0 diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml index 84bb841c3..03d592e76 100644 --- a/src/gui/tray/Window.qml +++ b/src/gui/tray/Window.qml @@ -1,8 +1,22 @@ +/* + * Copyright (C) 2020 by Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + import QtQuick 2.15 -import QtQuick.Window 2.3 -import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.2 -import QtGraphicalEffects 1.0 +import QtQuick.Window 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 +import QtGraphicalEffects 1.15 import Qt.labs.platform 1.1 as NativeDialogs import "../"