Moved VTextManager class into the vlayout folder in order for tests to compile. It also belong to vlayout folder more than into vtools

--HG--
branch : feature
This commit is contained in:
BojanKverh 2016-07-19 14:23:20 +02:00
parent 1759d4314f
commit 04780b4323
6 changed files with 6 additions and 6 deletions

View file

@ -16,6 +16,7 @@ HEADERS += \
$$PWD/vcontour_p.h \ $$PWD/vcontour_p.h \
$$PWD/vbestsquare.h \ $$PWD/vbestsquare.h \
$$PWD/vposition.h \ $$PWD/vposition.h \
$$PWD/vtextmanager.h \
vposter.h vposter.h
SOURCES += \ SOURCES += \
@ -27,6 +28,7 @@ SOURCES += \
$$PWD/vcontour.cpp \ $$PWD/vcontour.cpp \
$$PWD/vbestsquare.cpp \ $$PWD/vbestsquare.cpp \
$$PWD/vposition.cpp \ $$PWD/vposition.cpp \
$$PWD/vtextmanager.cpp \
vposter.cpp vposter.cpp
win32-msvc*:SOURCES += $$PWD/stable.cpp win32-msvc*:SOURCES += $$PWD/stable.cpp

View file

@ -32,7 +32,7 @@
#include "vabstractdetail.h" #include "vabstractdetail.h"
#include "../vpatterndb/vpatternpiecedata.h" #include "../vpatterndb/vpatternpiecedata.h"
#include "../vpatterndb/vpatterninfogeometry.h" #include "../vpatterndb/vpatterninfogeometry.h"
#include "../vtools/tools/vtextmanager.h" #include "vtextmanager.h"
#include <QMatrix> #include <QMatrix>
#include <QPointF> #include <QPointF>

View file

@ -51,8 +51,7 @@ HEADERS += \
$$PWD/drawTools/toolcurve/vtoolcubicbezier.h \ $$PWD/drawTools/toolcurve/vtoolcubicbezier.h \
$$PWD/drawTools/toolcurve/vtoolcubicbezierpath.h \ $$PWD/drawTools/toolcurve/vtoolcubicbezierpath.h \
$$PWD/drawTools/operation/vtoolrotation.h \ $$PWD/drawTools/operation/vtoolrotation.h \
$$PWD/vtextgraphicsitem.h \ $$PWD/vtextgraphicsitem.h
$$PWD/vtextmanager.h
SOURCES += \ SOURCES += \
$$PWD/vtooldetail.cpp \ $$PWD/vtooldetail.cpp \
@ -101,5 +100,4 @@ SOURCES += \
$$PWD/drawTools/toolcurve/vtoolcubicbezier.cpp \ $$PWD/drawTools/toolcurve/vtoolcubicbezier.cpp \
$$PWD/drawTools/toolcurve/vtoolcubicbezierpath.cpp \ $$PWD/drawTools/toolcurve/vtoolcubicbezierpath.cpp \
$$PWD/drawTools/operation/vtoolrotation.cpp \ $$PWD/drawTools/operation/vtoolrotation.cpp \
$$PWD/vtextgraphicsitem.cpp \ $$PWD/vtextgraphicsitem.cpp
$$PWD/vtextmanager.cpp

View file

@ -33,7 +33,7 @@
#include <QFont> #include <QFont>
#include <QList> #include <QList>
#include "vtextmanager.h" #include "../vlayout/vtextmanager.h"
class VTextGraphicsItem : public QGraphicsObject class VTextGraphicsItem : public QGraphicsObject
{ {