From: tbaudier <thomas.baudier@creatis.insa-lyon.fr>
Date: Thu, 4 Oct 2018 12:32:55 +0000 (+0200)
Subject: Merge branch 'drop_files' of https://github.com/m-pilia/vv into m-pilia-drop_files
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=clitk.git;a=commitdiff_plain;h=8f42f40e826ecc4cc45e08ed41cc5596da74991c

Merge branch 'drop_files' of https://github.com/m-pilia/vv into m-pilia-drop_files
---

8f42f40e826ecc4cc45e08ed41cc5596da74991c
diff --cc vv/vvMainWindow.h
index 2be7e75,2d6a21d..07f38e5
--- a/vv/vvMainWindow.h
+++ b/vv/vvMainWindow.h
@@@ -21,12 -21,8 +21,13 @@@
  
  #include <iostream>
  #include <vector>
+ #include <QDropEvent>
 +#include "vtkVersion.h"
 +#if (VTK_MAJOR_VERSION == 8 && VTK_MINOR_VERSION >= 1) || VTK_MAJOR_VERSION >= 9
  #include "ui_vvMainWindow.h"
 +#else
 +#include "ui_vvMainWindowVTK7.h"
 +#endif
  #include "vvMainWindowBase.h"
  #include "vvToolManager.h"
  #include "vvImageReader.h"