diff --git a/src/app/app.pro b/src/app/app.pro index 50d1eeab9..a806c91f0 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -617,6 +617,15 @@ DEPENDPATH += $$PWD/../libs/vmisc win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vmisc/$${DESTDIR}/vmisc.lib else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vmisc/$${DESTDIR}/libvmisc.a +#VWidgets static library +unix|win32: LIBS += -L$$OUT_PWD/../libs/vwidgets/$${DESTDIR}/ -lvwidgets + +INCLUDEPATH += $$PWD/../libs/vwidgets +DEPENDPATH += $$PWD/../libs/vwidgets + +win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vwidgets/$${DESTDIR}/vwidgets.lib +else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vwidgets/$${DESTDIR}/libvwidgets.a + noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols # do nothing } else { diff --git a/src/app/core/vapplication.h b/src/app/core/vapplication.h index e3086722b..8ccdcca44 100644 --- a/src/app/core/vapplication.h +++ b/src/app/core/vapplication.h @@ -31,7 +31,7 @@ #include #include "../options.h" -#include "../widgets/vmaingraphicsview.h" +#include "../libs/vwidgets/vmaingraphicsview.h" #include "../libs/vpatterndb/vtranslatevars.h" #include "vsettings.h" diff --git a/src/app/dialogs/app/configpages/patternpage.cpp b/src/app/dialogs/app/configpages/patternpage.cpp index e911bcd28..32e01b72d 100644 --- a/src/app/dialogs/app/configpages/patternpage.cpp +++ b/src/app/dialogs/app/configpages/patternpage.cpp @@ -30,7 +30,7 @@ #include "../../../options.h" #include "../../../core/vapplication.h" #include "../../../core/vsettings.h" -#include "../../../widgets/vmaingraphicsview.h" +#include "../../../../libs/vwidgets/vmaingraphicsview.h" #include #include #include diff --git a/src/app/dialogs/app/dialogincrements.cpp b/src/app/dialogs/app/dialogincrements.cpp index 3aa3d0bac..90ee3e4a0 100644 --- a/src/app/dialogs/app/dialogincrements.cpp +++ b/src/app/dialogs/app/dialogincrements.cpp @@ -28,9 +28,9 @@ #include "dialogincrements.h" #include "ui_dialogincrements.h" -#include "../../widgets/doubledelegate.h" -#include "../../widgets/textdelegate.h" -#include "../../widgets/vwidgetpopup.h" +#include "../../libs/vwidgets/doubledelegate.h" +#include "../../libs/vwidgets/textdelegate.h" +#include "../../libs/vwidgets/vwidgetpopup.h" #include "../../xml/vstandardmeasurements.h" #include "../../xml/vindividualmeasurements.h" #include "../../core/vsettings.h" diff --git a/src/app/dialogs/tools/dialogalongline.cpp b/src/app/dialogs/tools/dialogalongline.cpp index bbcd01fd8..0f81da4ee 100644 --- a/src/app/dialogs/tools/dialogalongline.cpp +++ b/src/app/dialogs/tools/dialogalongline.cpp @@ -30,7 +30,7 @@ #include "ui_dialogalongline.h" #include "../../visualization/vistoolalongline.h" #include "../../tools/vabstracttool.h" -#include "../../widgets/vmaingraphicsscene.h" +#include "../../libs/vwidgets/vmaingraphicsscene.h" #include "dialogeditwrongformula.h" #include diff --git a/src/app/dialogs/tools/dialogbisector.cpp b/src/app/dialogs/tools/dialogbisector.cpp index de3cb782f..e8c7d95c6 100644 --- a/src/app/dialogs/tools/dialogbisector.cpp +++ b/src/app/dialogs/tools/dialogbisector.cpp @@ -32,7 +32,7 @@ #include "../../libs/vgeometry/vpointf.h" #include "../../libs/vpatterndb/vcontainer.h" #include "../../visualization/vistoolbisector.h" -#include "../../widgets/vmaingraphicsscene.h" +#include "../../libs/vwidgets/vmaingraphicsscene.h" #include "../../tools/vabstracttool.h" #include "dialogeditwrongformula.h" diff --git a/src/app/dialogs/tools/dialogcurveintersectaxis.cpp b/src/app/dialogs/tools/dialogcurveintersectaxis.cpp index 93ca299b7..fd0dd5bc7 100644 --- a/src/app/dialogs/tools/dialogcurveintersectaxis.cpp +++ b/src/app/dialogs/tools/dialogcurveintersectaxis.cpp @@ -32,7 +32,7 @@ #include "../../libs/vgeometry/vpointf.h" #include "../../libs/vpatterndb/vcontainer.h" #include "../../visualization/vistoolcurveintersectaxis.h" -#include "../../widgets/vmaingraphicsscene.h" +#include "../../libs/vwidgets/vmaingraphicsscene.h" #include "../../tools/vabstracttool.h" #include "dialogeditwrongformula.h" diff --git a/src/app/dialogs/tools/dialogcutarc.cpp b/src/app/dialogs/tools/dialogcutarc.cpp index 2e0c08544..5c96add17 100644 --- a/src/app/dialogs/tools/dialogcutarc.cpp +++ b/src/app/dialogs/tools/dialogcutarc.cpp @@ -32,7 +32,7 @@ #include "../../libs/vgeometry/varc.h" #include "../../libs/vpatterndb/vcontainer.h" #include "../../visualization/vistoolcutarc.h" -#include "../../widgets/vmaingraphicsscene.h" +#include "../../libs/vwidgets/vmaingraphicsscene.h" #include "../../xml/vpattern.h" #include "dialogeditwrongformula.h" diff --git a/src/app/dialogs/tools/dialogendline.cpp b/src/app/dialogs/tools/dialogendline.cpp index 71f80a40b..6f6e429d1 100644 --- a/src/app/dialogs/tools/dialogendline.cpp +++ b/src/app/dialogs/tools/dialogendline.cpp @@ -32,7 +32,7 @@ #include "../../libs/vgeometry/vpointf.h" #include "../../libs/vpatterndb/vcontainer.h" #include "../../visualization/vistoolendline.h" -#include "../../widgets/vmaingraphicsscene.h" +#include "../../libs/vwidgets/vmaingraphicsscene.h" #include "../../tools/vabstracttool.h" #include "dialogeditwrongformula.h" #include diff --git a/src/app/dialogs/tools/dialogheight.cpp b/src/app/dialogs/tools/dialogheight.cpp index fb0f69cdd..145866c32 100644 --- a/src/app/dialogs/tools/dialogheight.cpp +++ b/src/app/dialogs/tools/dialogheight.cpp @@ -33,7 +33,7 @@ #include "../../libs/vpatterndb/vcontainer.h" #include "../../tools/vabstracttool.h" #include "../visualization/vistoolheight.h" -#include "../widgets/vmaingraphicsscene.h" +#include "../../libs/vwidgets/vmaingraphicsscene.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/dialogs/tools/dialogline.cpp b/src/app/dialogs/tools/dialogline.cpp index 18f69fcaa..d3badadb5 100644 --- a/src/app/dialogs/tools/dialogline.cpp +++ b/src/app/dialogs/tools/dialogline.cpp @@ -33,7 +33,7 @@ #include "../../libs/vpatterndb/vcontainer.h" #include "../../visualization/vistoolline.h" #include "../../core/vapplication.h" -#include "../../widgets/vmaingraphicsscene.h" +#include "../../libs/vwidgets/vmaingraphicsscene.h" #include "../../tools/vabstracttool.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialoglineintersect.cpp b/src/app/dialogs/tools/dialoglineintersect.cpp index 1ec708225..adb003cf5 100644 --- a/src/app/dialogs/tools/dialoglineintersect.cpp +++ b/src/app/dialogs/tools/dialoglineintersect.cpp @@ -32,7 +32,7 @@ #include "../../libs/vgeometry/vpointf.h" #include "../../libs/vpatterndb/vcontainer.h" #include "../../visualization/vistoollineintersect.h" -#include "../../widgets/vmaingraphicsscene.h" +#include "../../libs/vwidgets/vmaingraphicsscene.h" #include "../../xml/vpattern.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialoglineintersectaxis.cpp b/src/app/dialogs/tools/dialoglineintersectaxis.cpp index 20f0500ef..0402769b4 100644 --- a/src/app/dialogs/tools/dialoglineintersectaxis.cpp +++ b/src/app/dialogs/tools/dialoglineintersectaxis.cpp @@ -32,7 +32,7 @@ #include "../../libs/vgeometry/vpointf.h" #include "../../libs/vpatterndb/vcontainer.h" #include "../../visualization/vistoollineintersectaxis.h" -#include "../../widgets/vmaingraphicsscene.h" +#include "../../libs/vwidgets/vmaingraphicsscene.h" #include "../../tools/vabstracttool.h" #include "dialogeditwrongformula.h" diff --git a/src/app/dialogs/tools/dialognormal.cpp b/src/app/dialogs/tools/dialognormal.cpp index 00061f9da..c67f1f673 100644 --- a/src/app/dialogs/tools/dialognormal.cpp +++ b/src/app/dialogs/tools/dialognormal.cpp @@ -29,7 +29,7 @@ #include "dialognormal.h" #include "ui_dialognormal.h" #include "../visualization/vistoolnormal.h" -#include "../widgets/vmaingraphicsscene.h" +#include "../../../libs/vwidgets/vmaingraphicsscene.h" #include "../../tools/vabstracttool.h" #include "dialogeditwrongformula.h" diff --git a/src/app/dialogs/tools/dialogpointfromarcandtangent.cpp b/src/app/dialogs/tools/dialogpointfromarcandtangent.cpp index b4d0285b1..86d047129 100644 --- a/src/app/dialogs/tools/dialogpointfromarcandtangent.cpp +++ b/src/app/dialogs/tools/dialogpointfromarcandtangent.cpp @@ -32,7 +32,7 @@ #include "../../libs/vgeometry/vpointf.h" #include "../../libs/vpatterndb/vcontainer.h" #include "../../visualization/vistoolpointfromarcandtangent.h" -#include "../../widgets/vmaingraphicsscene.h" +#include "../../libs/vwidgets/vmaingraphicsscene.h" //--------------------------------------------------------------------------------------------------------------------- DialogPointFromArcAndTangent::DialogPointFromArcAndTangent(const VContainer *data, const quint32 &toolId, diff --git a/src/app/dialogs/tools/dialogpointfromcircleandtangent.cpp b/src/app/dialogs/tools/dialogpointfromcircleandtangent.cpp index 167f163f0..9608b2344 100644 --- a/src/app/dialogs/tools/dialogpointfromcircleandtangent.cpp +++ b/src/app/dialogs/tools/dialogpointfromcircleandtangent.cpp @@ -32,7 +32,7 @@ #include "../../libs/vgeometry/vpointf.h" #include "../../libs/vpatterndb/vcontainer.h" #include "../../visualization/vistoolpointfromcircleandtangent.h" -#include "../../widgets/vmaingraphicsscene.h" +#include "../../libs/vwidgets/vmaingraphicsscene.h" #include "dialogeditwrongformula.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogpointofcontact.cpp b/src/app/dialogs/tools/dialogpointofcontact.cpp index dc65404ff..08c17c0e3 100644 --- a/src/app/dialogs/tools/dialogpointofcontact.cpp +++ b/src/app/dialogs/tools/dialogpointofcontact.cpp @@ -31,7 +31,7 @@ #include "../../libs/vgeometry/vpointf.h" #include "../../libs/vpatterndb/vcontainer.h" #include "../../visualization/vistoolpointofcontact.h" -#include "../../widgets/vmaingraphicsscene.h" +#include "../libs/vwidgets/vmaingraphicsscene.h" #include "../../xml/vpattern.h" #include "dialogeditwrongformula.h" diff --git a/src/app/dialogs/tools/dialogpointofintersection.cpp b/src/app/dialogs/tools/dialogpointofintersection.cpp index 186df7882..510154b4b 100644 --- a/src/app/dialogs/tools/dialogpointofintersection.cpp +++ b/src/app/dialogs/tools/dialogpointofintersection.cpp @@ -32,7 +32,7 @@ #include "../../libs/vgeometry/vpointf.h" #include "../../libs/vpatterndb/vcontainer.h" #include "../../visualization/vistoolpointofintersection.h" -#include "../../widgets/vmaingraphicsscene.h" +#include "../../libs/vwidgets/vmaingraphicsscene.h" #include "../../xml/vpattern.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogpointofintersectionarcs.cpp b/src/app/dialogs/tools/dialogpointofintersectionarcs.cpp index bdeee9cd0..640b04f4d 100644 --- a/src/app/dialogs/tools/dialogpointofintersectionarcs.cpp +++ b/src/app/dialogs/tools/dialogpointofintersectionarcs.cpp @@ -32,7 +32,7 @@ #include "../../libs/vgeometry/vpointf.h" #include "../../libs/vpatterndb/vcontainer.h" #include "../../visualization/vistoolpointofintersectionarcs.h" -#include "../../widgets/vmaingraphicsscene.h" +#include "../../libs/vwidgets/vmaingraphicsscene.h" //--------------------------------------------------------------------------------------------------------------------- DialogPointOfIntersectionArcs::DialogPointOfIntersectionArcs(const VContainer *data, const quint32 &toolId, diff --git a/src/app/dialogs/tools/dialogpointofintersectioncircles.cpp b/src/app/dialogs/tools/dialogpointofintersectioncircles.cpp index ad957656b..a8c0779a3 100644 --- a/src/app/dialogs/tools/dialogpointofintersectioncircles.cpp +++ b/src/app/dialogs/tools/dialogpointofintersectioncircles.cpp @@ -32,7 +32,7 @@ #include "../../libs/vgeometry/vpointf.h" #include "../../libs/vpatterndb/vcontainer.h" #include "../../visualization/vistoolpointofintersectioncircles.h" -#include "../../widgets/vmaingraphicsscene.h" +#include "../../libs/vwidgets/vmaingraphicsscene.h" #include "dialogeditwrongformula.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogshoulderpoint.cpp b/src/app/dialogs/tools/dialogshoulderpoint.cpp index 12fcfa1cc..b1c3ae863 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.cpp +++ b/src/app/dialogs/tools/dialogshoulderpoint.cpp @@ -32,7 +32,7 @@ #include "../../libs/vgeometry/vpointf.h" #include "../../libs/vpatterndb/vcontainer.h" #include "../../visualization/vistoolshoulderpoint.h" -#include "../../widgets/vmaingraphicsscene.h" +#include "../libs/vwidgets/vmaingraphicsscene.h" #include "../../tools/vabstracttool.h" #include "dialogeditwrongformula.h" diff --git a/src/app/dialogs/tools/dialogtool.h b/src/app/dialogs/tools/dialogtool.h index a39adb095..f3f04e449 100644 --- a/src/app/dialogs/tools/dialogtool.h +++ b/src/app/dialogs/tools/dialogtool.h @@ -30,8 +30,8 @@ #define DIALOGTOOL_H #include "../../core/vapplication.h" -#include "../vmisc/logging.h" -#include "../../widgets/vmaingraphicsscene.h" +#include "../libs/vmisc/logging.h" +#include "../libs/vwidgets/vmaingraphicsscene.h" #include "../../visualization/visualization.h" #include "../../xml/vpattern.h" diff --git a/src/app/dialogs/tools/dialogtriangle.cpp b/src/app/dialogs/tools/dialogtriangle.cpp index fdee8a144..97bfbee1b 100644 --- a/src/app/dialogs/tools/dialogtriangle.cpp +++ b/src/app/dialogs/tools/dialogtriangle.cpp @@ -31,7 +31,7 @@ #include "../../libs/vgeometry/vpointf.h" #include "../../libs/vpatterndb/vcontainer.h" #include "../../visualization/vistooltriangle.h" -#include "../../widgets/vmaingraphicsscene.h" +#include "../libs/vwidgets/vmaingraphicsscene.h" #include "../../xml/vpattern.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/mainwindow.h b/src/app/mainwindow.h index d43b58855..9751d35e7 100644 --- a/src/app/mainwindow.h +++ b/src/app/mainwindow.h @@ -30,7 +30,7 @@ #define MAINWINDOW_H #include "mainwindowsnogui.h" -#include "widgets/vmaingraphicsview.h" +#include "../libs/vwidgets/vmaingraphicsview.h" #include "dialogs/dialogs.h" #include "tools/vtooldetail.h" #include "tools/vtooluniondetails.h" diff --git a/src/app/tools/drawTools/vdrawtool.h b/src/app/tools/drawTools/vdrawtool.h index bae635ed5..9e968dc46 100644 --- a/src/app/tools/drawTools/vdrawtool.h +++ b/src/app/tools/drawTools/vdrawtool.h @@ -34,7 +34,7 @@ #include #include #include "../../dialogs/tools/dialogtool.h" -#include "../../widgets/vmaingraphicsscene.h" +#include "../../libs/vwidgets/vmaingraphicsscene.h" #include "../../xml/vpattern.h" /** diff --git a/src/app/tools/drawTools/vtoolcurveintersectaxis.cpp b/src/app/tools/drawTools/vtoolcurveintersectaxis.cpp index 26c90c11b..b335d2fc8 100644 --- a/src/app/tools/drawTools/vtoolcurveintersectaxis.cpp +++ b/src/app/tools/drawTools/vtoolcurveintersectaxis.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vtoolcurveintersectaxis.h" -#include "../../widgets/vmaingraphicsscene.h" +#include "../../libs/vwidgets/vmaingraphicsscene.h" #include "../../libs/vpatterndb/calculator.h" #include "../../dialogs/tools/dialogcurveintersectaxis.h" #include "../../dialogs/tools/dialogeditwrongformula.h" diff --git a/src/app/tools/drawTools/vtoolcut.h b/src/app/tools/drawTools/vtoolcut.h index 1c78202d9..eb71ac1d7 100644 --- a/src/app/tools/drawTools/vtoolcut.h +++ b/src/app/tools/drawTools/vtoolcut.h @@ -30,7 +30,7 @@ #define VTOOLCUT_H #include "vtoolpoint.h" -#include "../../visualization/vsimplecurve.h" +#include "../../libs/vwidgets/vsimplecurve.h" #include "vabstractspline.h" class VFormula; diff --git a/src/app/tools/drawTools/vtoolendline.cpp b/src/app/tools/drawTools/vtoolendline.cpp index 25b8ad8f9..b95bd79bb 100644 --- a/src/app/tools/drawTools/vtoolendline.cpp +++ b/src/app/tools/drawTools/vtoolendline.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vtoolendline.h" -#include "../../widgets/vmaingraphicsscene.h" +#include "../../libs/vwidgets/vmaingraphicsscene.h" #include "../../libs/vpatterndb/calculator.h" #include "../../dialogs/tools/dialogendline.h" #include "../../dialogs/tools/dialogeditwrongformula.h" diff --git a/src/app/tools/drawTools/vtoollineintersectaxis.cpp b/src/app/tools/drawTools/vtoollineintersectaxis.cpp index e6adc40b9..d40cfe561 100644 --- a/src/app/tools/drawTools/vtoollineintersectaxis.cpp +++ b/src/app/tools/drawTools/vtoollineintersectaxis.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vtoollineintersectaxis.h" -#include "../../widgets/vmaingraphicsscene.h" +#include "../../libs/vwidgets/vmaingraphicsscene.h" #include "../../libs/vpatterndb/calculator.h" #include "../../dialogs/tools/dialoglineintersectaxis.h" #include "../../dialogs/tools/dialogeditwrongformula.h" diff --git a/src/app/tools/vabstracttool.cpp b/src/app/tools/vabstracttool.cpp index 7bd1d356b..2611126c1 100644 --- a/src/app/tools/vabstracttool.cpp +++ b/src/app/tools/vabstracttool.cpp @@ -37,7 +37,7 @@ #include "../core/vapplication.h" #include "../libs/vgeometry/vpointf.h" #include "../undocommands/savetooloptions.h" -#include "../widgets/vmaingraphicsview.h" +#include "../libs/vwidgets/vmaingraphicsview.h" #include "../core/vsettings.h" const QString VAbstractTool::AttrType = QStringLiteral("type"); diff --git a/src/app/tools/vabstracttool.h b/src/app/tools/vabstracttool.h index 0d02d5a4d..92510807b 100644 --- a/src/app/tools/vabstracttool.h +++ b/src/app/tools/vabstracttool.h @@ -32,7 +32,7 @@ #include "vdatatool.h" #include "../xml/vpattern.h" #include "../core/vapplication.h" -#include "../widgets/vmaingraphicsscene.h" +#include "../libs/vwidgets/vmaingraphicsscene.h" #include "../visualization/visualization.h" class QDomElement; diff --git a/src/app/tools/vtooldetail.cpp b/src/app/tools/vtooldetail.cpp index a732c38ba..2412bac8c 100644 --- a/src/app/tools/vtooldetail.cpp +++ b/src/app/tools/vtooldetail.cpp @@ -30,7 +30,7 @@ #include "nodeDetails/nodedetails.h" #include "../libs/vgeometry/varc.h" #include "../libs/vgeometry/vsplinepath.h" -#include "../widgets/vmaingraphicsscene.h" +#include "../libs/vwidgets/vmaingraphicsscene.h" #include "../dialogs/tools/dialogtool.h" #include "../dialogs/tools/dialogdetail.h" #include diff --git a/src/app/undocommands/addtocalc.cpp b/src/app/undocommands/addtocalc.cpp index 5f1d5a35c..bab94b40a 100644 --- a/src/app/undocommands/addtocalc.cpp +++ b/src/app/undocommands/addtocalc.cpp @@ -30,8 +30,8 @@ #include "../xml/vpattern.h" #include "../tools/vabstracttool.h" #include "../core/vapplication.h" -#include "../widgets/vmaingraphicsscene.h" -#include "../widgets/vmaingraphicsview.h" +#include "../libs/vwidgets/vmaingraphicsscene.h" +#include "../libs/vwidgets/vmaingraphicsview.h" //--------------------------------------------------------------------------------------------------------------------- AddToCalc::AddToCalc(const QDomElement &xml, VPattern *doc, QUndoCommand *parent) diff --git a/src/app/visualization/visualization.h b/src/app/visualization/visualization.h index 56b141fa6..4f03b4262 100644 --- a/src/app/visualization/visualization.h +++ b/src/app/visualization/visualization.h @@ -33,7 +33,7 @@ #include #include "../core/vapplication.h" -#include "../widgets/vmaingraphicsscene.h" +#include "../libs/vwidgets/vmaingraphicsscene.h" #include "../vmisc/logging.h" #include "../../libs/vpatterndb/vcontainer.h" diff --git a/src/app/visualization/visualization.pri b/src/app/visualization/visualization.pri index 22b859b49..cca79ad52 100644 --- a/src/app/visualization/visualization.pri +++ b/src/app/visualization/visualization.pri @@ -4,7 +4,6 @@ HEADERS += \ $$PWD/vgraphicssimpletextitem.h \ $$PWD/vcontrolpointspline.h \ - $$PWD/vsimplecurve.h \ $$PWD/visline.h \ $$PWD/vistoolline.h \ $$PWD/vistoolendline.h \ @@ -36,7 +35,6 @@ HEADERS += \ SOURCES += \ $$PWD/vgraphicssimpletextitem.cpp \ $$PWD/vcontrolpointspline.cpp \ - $$PWD/vsimplecurve.cpp \ $$PWD/visline.cpp \ $$PWD/vistoolline.cpp \ $$PWD/vistoolendline.cpp \ diff --git a/src/app/widgets/widgets.pri b/src/app/widgets/widgets.pri index e82137562..9e67bb64b 100644 --- a/src/app/widgets/widgets.pri +++ b/src/app/widgets/widgets.pri @@ -2,21 +2,11 @@ # This need for corect working file translations.pro HEADERS += \ - $$PWD/vmaingraphicsview.h \ - $$PWD/vmaingraphicsscene.h \ - $$PWD/doubledelegate.h \ - $$PWD/textdelegate.h \ $$PWD/vtooloptionspropertybrowser.h \ $$PWD/vformulapropertyeditor.h \ - $$PWD/vformulaproperty.h \ - $$PWD/vwidgetpopup.h + $$PWD/vformulaproperty.h SOURCES += \ - $$PWD/vmaingraphicsview.cpp \ - $$PWD/vmaingraphicsscene.cpp \ - $$PWD/doubledelegate.cpp \ - $$PWD/textdelegate.cpp \ $$PWD/vtooloptionspropertybrowser.cpp \ $$PWD/vformulapropertyeditor.cpp \ - $$PWD/vformulaproperty.cpp \ - $$PWD/vwidgetpopup.cpp + $$PWD/vformulaproperty.cpp diff --git a/src/libs/libs.pro b/src/libs/libs.pro index 4d31c3064..83421d31b 100644 --- a/src/libs/libs.pro +++ b/src/libs/libs.pro @@ -7,6 +7,7 @@ SUBDIRS = \ vlayout \ vgeometry \ vpatterndb \ - vmisc + vmisc \ + vwidgets vgeometry.depends = ifc diff --git a/src/app/widgets/doubledelegate.cpp b/src/libs/vwidgets/doubledelegate.cpp similarity index 100% rename from src/app/widgets/doubledelegate.cpp rename to src/libs/vwidgets/doubledelegate.cpp diff --git a/src/app/widgets/doubledelegate.h b/src/libs/vwidgets/doubledelegate.h similarity index 100% rename from src/app/widgets/doubledelegate.h rename to src/libs/vwidgets/doubledelegate.h diff --git a/src/libs/vwidgets/stable.cpp b/src/libs/vwidgets/stable.cpp new file mode 100644 index 000000000..a42d3fd7c --- /dev/null +++ b/src/libs/vwidgets/stable.cpp @@ -0,0 +1,30 @@ +/************************************************************************ + ** + ** @file stable.cpp + ** @author Roman Telezhynskyi + ** @date 10 12, 2014 + ** + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013-2015 Valentina project + ** All Rights Reserved. + ** + ** Valentina is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + *************************************************************************/ + +// Build the precompiled headers. +#include "stable.h" diff --git a/src/libs/vwidgets/stable.h b/src/libs/vwidgets/stable.h new file mode 100644 index 000000000..e19a85cee --- /dev/null +++ b/src/libs/vwidgets/stable.h @@ -0,0 +1,52 @@ +/************************************************************************ + ** + ** @file stable.h + ** @author Roman Telezhynskyi + ** @date 10 12, 2014 + ** + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013-2015 Valentina project + ** All Rights Reserved. + ** + ** Valentina is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + *************************************************************************/ + +#ifndef STABLE_H +#define STABLE_H + +/* I like to include this pragma too, so the build log indicates if pre-compiled headers were in use. */ +#ifndef __clang__ +#pragma message("Compiling precompiled headers for VPatternDB library.\n") +#endif + +/* Add C includes here */ + +#if defined __cplusplus +/* Add C++ includes here */ + +#ifdef QT_CORE_LIB +#include +#endif + +#ifdef QT_GUI_LIB +# include +#endif + +#endif/*__cplusplus*/ + +#endif // STABLE_H diff --git a/src/app/widgets/textdelegate.cpp b/src/libs/vwidgets/textdelegate.cpp similarity index 99% rename from src/app/widgets/textdelegate.cpp rename to src/libs/vwidgets/textdelegate.cpp index e33822289..1a9768454 100644 --- a/src/app/widgets/textdelegate.cpp +++ b/src/libs/vwidgets/textdelegate.cpp @@ -28,7 +28,7 @@ #include "textdelegate.h" #include -#include "../libs/vpatterndb/vcontainer.h" +#include "../vpatterndb/vcontainer.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/widgets/textdelegate.h b/src/libs/vwidgets/textdelegate.h similarity index 100% rename from src/app/widgets/textdelegate.h rename to src/libs/vwidgets/textdelegate.h diff --git a/src/app/widgets/vmaingraphicsscene.cpp b/src/libs/vwidgets/vmaingraphicsscene.cpp similarity index 100% rename from src/app/widgets/vmaingraphicsscene.cpp rename to src/libs/vwidgets/vmaingraphicsscene.cpp diff --git a/src/app/widgets/vmaingraphicsscene.h b/src/libs/vwidgets/vmaingraphicsscene.h similarity index 100% rename from src/app/widgets/vmaingraphicsscene.h rename to src/libs/vwidgets/vmaingraphicsscene.h diff --git a/src/app/widgets/vmaingraphicsview.cpp b/src/libs/vwidgets/vmaingraphicsview.cpp similarity index 99% rename from src/app/widgets/vmaingraphicsview.cpp rename to src/libs/vwidgets/vmaingraphicsview.cpp index 41e55d811..7c87b8516 100644 --- a/src/app/widgets/vmaingraphicsview.cpp +++ b/src/libs/vwidgets/vmaingraphicsview.cpp @@ -32,7 +32,7 @@ #include #include #include -#include "../visualization/vsimplecurve.h" +#include "vsimplecurve.h" #include #include diff --git a/src/app/widgets/vmaingraphicsview.h b/src/libs/vwidgets/vmaingraphicsview.h similarity index 100% rename from src/app/widgets/vmaingraphicsview.h rename to src/libs/vwidgets/vmaingraphicsview.h diff --git a/src/app/visualization/vsimplecurve.cpp b/src/libs/vwidgets/vsimplecurve.cpp similarity index 100% rename from src/app/visualization/vsimplecurve.cpp rename to src/libs/vwidgets/vsimplecurve.cpp diff --git a/src/app/visualization/vsimplecurve.h b/src/libs/vwidgets/vsimplecurve.h similarity index 98% rename from src/app/visualization/vsimplecurve.h rename to src/libs/vwidgets/vsimplecurve.h index c098e3660..4f31eba73 100644 --- a/src/app/visualization/vsimplecurve.h +++ b/src/libs/vwidgets/vsimplecurve.h @@ -30,7 +30,7 @@ #define VSIMPLECURVE_H #include -#include "../libs/vgeometry/vabstractcurve.h" +#include "../vgeometry/vabstractcurve.h" #include "../vmisc/def.h" enum class SimpleCurvePoint : char { FirstPoint, ForthPoint }; diff --git a/src/app/widgets/vwidgetpopup.cpp b/src/libs/vwidgets/vwidgetpopup.cpp similarity index 100% rename from src/app/widgets/vwidgetpopup.cpp rename to src/libs/vwidgets/vwidgetpopup.cpp diff --git a/src/app/widgets/vwidgetpopup.h b/src/libs/vwidgets/vwidgetpopup.h similarity index 100% rename from src/app/widgets/vwidgetpopup.h rename to src/libs/vwidgets/vwidgetpopup.h diff --git a/src/libs/vwidgets/vwidgets.pri b/src/libs/vwidgets/vwidgets.pri new file mode 100644 index 000000000..0ddb4e7cc --- /dev/null +++ b/src/libs/vwidgets/vwidgets.pri @@ -0,0 +1,20 @@ +# ADD TO EACH PATH $$PWD VARIABLE!!!!!! +# This need for corect working file translations.pro + +SOURCES += \ + $$PWD/stable.cpp \ + $$PWD/doubledelegate.cpp \ + $$PWD/textdelegate.cpp \ + $$PWD/vmaingraphicsscene.cpp \ + $$PWD/vmaingraphicsview.cpp \ + $$PWD/vsimplecurve.cpp \ + $$PWD/vwidgetpopup.cpp + +HEADERS += \ + $$PWD/stable.h \ + $$PWD/doubledelegate.h \ + $$PWD/textdelegate.h \ + $$PWD/vmaingraphicsscene.h \ + $$PWD/vmaingraphicsview.h \ + $$PWD/vsimplecurve.h \ + $$PWD/vwidgetpopup.h diff --git a/src/libs/vwidgets/vwidgets.pro b/src/libs/vwidgets/vwidgets.pro new file mode 100644 index 000000000..28b9e641f --- /dev/null +++ b/src/libs/vwidgets/vwidgets.pro @@ -0,0 +1,96 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2015-06-15T15:24:19 +# +#------------------------------------------------- + +# File with common stuff for whole project +include(../../../Valentina.pri) + +# Name of the library +TARGET = vwidgets + +# We want create a library +TEMPLATE = lib + +CONFIG += \ + staticlib \# Making static library + c++11 # We use C++11 standard + +# Use out-of-source builds (shadow builds) +CONFIG -= debug_and_release debug_and_release_target + +# Since Qt 5.4.0 the source code location is recorded only in debug builds. +# We need this information also in release builds. For this need define QT_MESSAGELOGCONTEXT. +DEFINES += QT_MESSAGELOGCONTEXT + +include(vwidgets.pri) + +# This is static library so no need in "make install" + +# directory for executable file +DESTDIR = bin + +# files created moc +MOC_DIR = moc + +# objecs files +OBJECTS_DIR = obj + +# Set using ccache. Function enable_ccache() defined in Valentina.pri. +$$enable_ccache() + +# Set precompiled headers. Function set_PCH() defined in Valentina.pri. +$$set_PCH() + +CONFIG(debug, debug|release){ + # Debug mode + unix { + #Turn on compilers warnings. + *-g++{ + QMAKE_CXXFLAGS += \ + # Key -isystem disable checking errors in system headers. + -isystem "$${OUT_PWD}/$${MOC_DIR}" \ + $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + + noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer + # do nothing + } else { + #gcc’s 4.8.0 Address Sanitizer + #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/ + QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer + QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer + QMAKE_LFLAGS += -fsanitize=address + } + } + clang*{ + QMAKE_CXXFLAGS += \ + # Key -isystem disable checking errors in system headers. + -isystem "$${OUT_PWD}/$${MOC_DIR}" \ + $$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. + } + } else { + *-g++{ + QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + } + } + +}else{ + # Release mode + + !unix:*-g++{ + QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll + } + + noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols + # do nothing + } else { + !macx:!win32-msvc*{ + # Turn on debug symbols in release mode on Unix systems. + # On Mac OS X temporarily disabled. TODO: find way how to strip binary file. + QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 + QMAKE_CFLAGS_RELEASE += -g -gdwarf-3 + QMAKE_LFLAGS_RELEASE = + } + } +}