Fix build on Qt\5.3\msvc2013_64_opengl.

--HG-- branch : develop
2024-07-01 00:28:12 +02:00 · 2016-08-08 22:59:35 +03:00 · 2016-08-08 22:59:35 +03:00 · ec053ba5bf
parent 6c04438a02
commit ec053ba5bf
15 changed files with 6 additions and 27 deletions
--- a/src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.h
@ -32,8 +32,6 @@

 #include "../../vproperty.h"
 #include "../../vpropertyexplorer_global.h"
-#include "vproperty.h"
-#include "vpropertyexplorer_global.h"

 namespace VPE
 {
--- a/src/libs/vpropertyexplorer/plugins/vboolproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/vboolproperty.h
@ -31,8 +31,7 @@
 #include <QtGlobal>

 #include "../vproperty.h"
-#include "vproperty.h"
-#include "vpropertyexplorer_global.h"
+#include "../vpropertyexplorer_global.h"

 namespace VPE
 {
--- a/src/libs/vpropertyexplorer/plugins/vcolorproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/vcolorproperty.h
@ -33,8 +33,6 @@

 #include "../vproperty.h"
 #include "../vpropertyexplorer_global.h"
-#include "vproperty.h"
-#include "vpropertyexplorer_global.h"

 class QAbstractItemDelegate;
 class QStyleOptionViewItem;
--- a/src/libs/vpropertyexplorer/plugins/vemptyproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/vemptyproperty.h
@ -31,7 +31,7 @@
 #include <QtGlobal>

 #include "../vproperty.h"
-#include "vpropertyexplorer_global.h"
+#include "../vpropertyexplorer_global.h"

 class QAbstractItemDelegate;
 class QStyleOptionViewItem;
--- a/src/libs/vpropertyexplorer/plugins/venumproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/venumproperty.h
@ -32,8 +32,7 @@
 #include <QtGlobal>

 #include "../vproperty.h"
-#include "vproperty.h"
-#include "vpropertyexplorer_global.h"
+#include "../vpropertyexplorer_global.h"

 class QAbstractItemDelegate;
 class QStyleOptionViewItem;
--- a/src/libs/vpropertyexplorer/plugins/vfileproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/vfileproperty.h
@ -34,8 +34,6 @@

 #include "../vproperty.h"
 #include "../vpropertyexplorer_global.h"
-#include "vproperty.h"
-#include "vpropertyexplorer_global.h"

 class QAbstractItemDelegate;
 class QStyleOptionViewItem;
--- a/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.h
@ -41,8 +41,7 @@
 #include <QtGlobal>

 #include "../vproperty.h"
-#include "vproperty.h"
-#include "vpropertyexplorer_global.h"
+#include "../vpropertyexplorer_global.h"

 class QAbstractItemDelegate;
 class QStyleOptionViewItem;
--- a/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.h
@ -42,8 +42,7 @@
 #include <QtGlobal>

 #include "../vproperty.h"
-#include "vproperty.h"
-#include "vpropertyexplorer_global.h"
+#include "../vpropertyexplorer_global.h"

 class QAbstractItemDelegate;
 class QStyleOptionViewItem;
--- a/src/libs/vpropertyexplorer/plugins/vnumberproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/vnumberproperty.h
@ -34,8 +34,6 @@

 #include "../vproperty.h"
 #include "../vpropertyexplorer_global.h"
-#include "vproperty.h"
-#include "vpropertyexplorer_global.h"

 class QAbstractItemDelegate;
 class QStyleOptionViewItem;
--- a/src/libs/vpropertyexplorer/plugins/vobjectproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/vobjectproperty.h
@ -33,8 +33,7 @@
 #include <QtGlobal>

 #include "../vproperty.h"
-#include "vproperty.h"
-#include "vpropertyexplorer_global.h"
+#include "../vpropertyexplorer_global.h"

 class QAbstractItemDelegate;
 class QComboBox;
--- a/src/libs/vpropertyexplorer/plugins/vpointfproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/vpointfproperty.h
@ -32,8 +32,6 @@

 #include "../vproperty.h"
 #include "../vpropertyexplorer_global.h"
-#include "vproperty.h"
-#include "vpropertyexplorer_global.h"

 class QPointF;

--- a/src/libs/vpropertyexplorer/plugins/vshortcutproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/vshortcutproperty.h
@ -32,8 +32,6 @@

 #include "../vproperty.h"
 #include "../vpropertyexplorer_global.h"
-#include "vproperty.h"
-#include "vpropertyexplorer_global.h"

 class QAbstractItemDelegate;
 class QStyleOptionViewItem;
--- a/src/libs/vpropertyexplorer/plugins/vstringproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/vstringproperty.h
@ -33,8 +33,6 @@

 #include "../vproperty.h"
 #include "../vpropertyexplorer_global.h"
-#include "vproperty.h"
-#include "vpropertyexplorer_global.h"

 class QAbstractItemDelegate;
 class QStyleOptionViewItem;
--- a/src/libs/vpropertyexplorer/plugins/vwidgetproperty.h
+++ b/src/libs/vpropertyexplorer/plugins/vwidgetproperty.h
@ -27,7 +27,6 @@

 #include "../vpropertyexplorer_global.h"
 #include "vemptyproperty.h"
-#include "vpropertyexplorer_global.h"

 class QWidget;
 namespace VPE {
--- a/src/libs/vpropertyexplorer/vpropertyformwidget.h
+++ b/src/libs/vpropertyexplorer/vpropertyformwidget.h
@ -29,7 +29,6 @@
 #include <QString>
 #include <QtGlobal>

-#include "plugins/../vproperty.h"
 #include "vproperty.h"

 class QEvent;