diff --git a/src/libs/vlayout/vlayout.pri b/src/libs/vlayout/vlayout.pri index 171d943cd..d1cc7645f 100644 --- a/src/libs/vlayout/vlayout.pri +++ b/src/libs/vlayout/vlayout.pri @@ -16,6 +16,7 @@ HEADERS += \ $$PWD/vcontour_p.h \ $$PWD/vbestsquare.h \ $$PWD/vposition.h \ + $$PWD/vtextmanager.h \ vposter.h SOURCES += \ @@ -27,6 +28,7 @@ SOURCES += \ $$PWD/vcontour.cpp \ $$PWD/vbestsquare.cpp \ $$PWD/vposition.cpp \ + $$PWD/vtextmanager.cpp \ vposter.cpp win32-msvc*:SOURCES += $$PWD/stable.cpp diff --git a/src/libs/vlayout/vlayoutdetail.h b/src/libs/vlayout/vlayoutdetail.h index 02f180cea..e813fe9e3 100644 --- a/src/libs/vlayout/vlayoutdetail.h +++ b/src/libs/vlayout/vlayoutdetail.h @@ -32,7 +32,7 @@ #include "vabstractdetail.h" #include "../vpatterndb/vpatternpiecedata.h" #include "../vpatterndb/vpatterninfogeometry.h" -#include "../vtools/tools/vtextmanager.h" +#include "vtextmanager.h" #include #include diff --git a/src/libs/vtools/tools/vtextmanager.cpp b/src/libs/vlayout/vtextmanager.cpp similarity index 100% rename from src/libs/vtools/tools/vtextmanager.cpp rename to src/libs/vlayout/vtextmanager.cpp diff --git a/src/libs/vtools/tools/vtextmanager.h b/src/libs/vlayout/vtextmanager.h similarity index 100% rename from src/libs/vtools/tools/vtextmanager.h rename to src/libs/vlayout/vtextmanager.h diff --git a/src/libs/vtools/tools/tools.pri b/src/libs/vtools/tools/tools.pri index f40f507c5..0391ca475 100644 --- a/src/libs/vtools/tools/tools.pri +++ b/src/libs/vtools/tools/tools.pri @@ -51,8 +51,7 @@ HEADERS += \ $$PWD/drawTools/toolcurve/vtoolcubicbezier.h \ $$PWD/drawTools/toolcurve/vtoolcubicbezierpath.h \ $$PWD/drawTools/operation/vtoolrotation.h \ - $$PWD/vtextgraphicsitem.h \ - $$PWD/vtextmanager.h + $$PWD/vtextgraphicsitem.h SOURCES += \ $$PWD/vtooldetail.cpp \ @@ -101,5 +100,4 @@ SOURCES += \ $$PWD/drawTools/toolcurve/vtoolcubicbezier.cpp \ $$PWD/drawTools/toolcurve/vtoolcubicbezierpath.cpp \ $$PWD/drawTools/operation/vtoolrotation.cpp \ - $$PWD/vtextgraphicsitem.cpp \ - $$PWD/vtextmanager.cpp + $$PWD/vtextgraphicsitem.cpp diff --git a/src/libs/vtools/tools/vtextgraphicsitem.h b/src/libs/vtools/tools/vtextgraphicsitem.h index 7ee41aabe..6e5ddb92c 100644 --- a/src/libs/vtools/tools/vtextgraphicsitem.h +++ b/src/libs/vtools/tools/vtextgraphicsitem.h @@ -33,7 +33,7 @@ #include #include -#include "vtextmanager.h" +#include "../vlayout/vtextmanager.h" class VTextGraphicsItem : public QGraphicsObject {