]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Merge branch 'release/20.08' into master
authorElvis Angelaccio <elvis.angelaccio@kde.org>
Sat, 5 Sep 2020 20:55:59 +0000 (22:55 +0200)
committerElvis Angelaccio <elvis.angelaccio@kde.org>
Sat, 5 Sep 2020 20:55:59 +0000 (22:55 +0200)
1  2 
src/kitemviews/kitemlistcontroller.cpp

index 2b52666009112ed88c08b4fbccc37040c21ccccc,5ddf52e5f193dc84671c3248696d74f2bbeb8bf3..ca385899b6db63406dd9832e4d3c34ed4c441b87
@@@ -1,11 -1,24 +1,11 @@@
 -/***************************************************************************
 - *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>             *
 - *   Copyright (C) 2012 by Frank Reininghaus <frank78ac@googlemail.com>    *
 - *                                                                         *
 - *   Based on the Itemviews NG project from Trolltech Labs                 *
 - *                                                                         *
 - *   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.                          *
 - *                                                                         *
 - *   You should have received a copy of the GNU General Public License     *
 - *   along with this program; if not, write to the                         *
 - *   Free Software Foundation, Inc.,                                       *
 - *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
 - ***************************************************************************/
 +/*
 + * SPDX-FileCopyrightText: 2011 Peter Penz <peter.penz19@gmail.com>
 + * SPDX-FileCopyrightText: 2012 Frank Reininghaus <frank78ac@googlemail.com>
 + *
 + * Based on the Itemviews NG project from Trolltech Labs
 + *
 + * SPDX-License-Identifier: GPL-2.0-or-later
 + */
  
  #include "kitemlistcontroller.h"
  
@@@ -780,7 -793,7 +780,7 @@@ bool KItemListController::mouseReleaseE
              if (emitItemActivated) {
                  emit itemActivated(index);
              }
 -        } else if (event->button() & Qt::MidButton) {
 +        } else if (event->button() & Qt::MiddleButton) {
              emit itemMiddleClicked(index);
          }
      }
@@@ -1206,7 -1219,7 +1206,7 @@@ void KItemListController::startDragging
      const QPoint hotSpot((pixmap.width() / pixmap.devicePixelRatio()) / 2, 0);
      drag->setHotSpot(hotSpot);
  
-     drag->exec(Qt::MoveAction | Qt::CopyAction | Qt::LinkAction, Qt::MoveAction);
+     drag->exec(Qt::MoveAction | Qt::CopyAction | Qt::LinkAction, Qt::CopyAction);
  
      QAccessibleEvent accessibilityEvent(view(), QAccessible::DragDropStart);
      QAccessible::updateAccessibility(&accessibilityEvent);