[Libreoffice-commits] core.git: vcl/qt5

Jan-Marek Glogowski (via logerrit) logerrit at kemper.freedesktop.org
Sat Jun 15 08:54:21 UTC 2019


 vcl/qt5/Qt5DragAndDrop.cxx |    1 +
 vcl/qt5/Qt5Frame.cxx       |    2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 5195c5bcd8be5f3b183659ead272cd86b8774cc1
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Fri Jun 14 02:30:01 2019 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Sat Jun 15 10:53:11 2019 +0200

    Qt5 move and init static m_ActiveDragSource
    
    Change-Id: Iab82151b8d1a8281c9999983b9de5f35dfb0442e
    Reviewed-on: https://gerrit.libreoffice.org/74013
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/vcl/qt5/Qt5DragAndDrop.cxx b/vcl/qt5/Qt5DragAndDrop.cxx
index 74908d2cba8f..118939cdae8f 100644
--- a/vcl/qt5/Qt5DragAndDrop.cxx
+++ b/vcl/qt5/Qt5DragAndDrop.cxx
@@ -22,6 +22,7 @@ using namespace com::sun::star;
 
 bool Qt5DragSource::m_bDropSuccessSet = false;
 bool Qt5DragSource::m_bDropSuccess = false;
+Qt5DragSource* Qt5DragSource::m_ActiveDragSource = nullptr;
 
 Qt5DragSource::~Qt5DragSource() {}
 
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 49d68a1cd2f9..48a4403214ea 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -1155,8 +1155,6 @@ void Qt5Frame::SetApplicationID(const OUString& rWMClass)
 
 // Drag'n'drop foo
 
-Qt5DragSource* Qt5DragSource::m_ActiveDragSource;
-
 void Qt5Frame::registerDragSource(Qt5DragSource* pDragSource)
 {
     assert(!m_pDragSource);


More information about the Libreoffice-commits mailing list