From d0c129478ec16aa869270444a90957ad305ff1b9 Mon Sep 17 00:00:00 2001 From: Simon De Backer Date: Wed, 9 Dec 2020 15:28:43 +0100 Subject: [PATCH] Mod Cmake en preprocessor --- CMakeLists.txt | 216 ++++++++++++------ .../elementcollectionhandler.cpp | 8 +- .../ElementsCollection/elementslocation.cpp | 14 +- .../ElementsCollection/elementstreeview.cpp | 2 +- .../fileelementcollectionitem.cpp | 5 +- sources/ElementsCollection/ui/renamedialog.h | 3 +- .../xmlprojectelementcollectionitem.cpp | 7 +- .../ui/replaceadvanceddialog.cpp | 5 +- .../ui/replaceelementdialog.cpp | 9 +- sources/dataBase/ui/elementquerywidget.cpp | 5 +- sources/dataBase/ui/summaryquerywidget.cpp | 5 +- sources/dvevent/dveventinterface.cpp | 4 +- sources/editor/arceditor.cpp | 7 +- sources/editor/editorcommands.h | 6 +- sources/editor/elementprimitivedecorator.cpp | 14 +- sources/editor/elementprimitivedecorator.h | 3 +- sources/editor/elementview.cpp | 5 +- .../graphicspart/customelementgraphicpart.cpp | 3 +- .../editor/graphicspart/customelementpart.h | 2 +- sources/editor/graphicspart/partarc.cpp | 8 +- .../graphicspart/partdynamictextfield.cpp | 9 +- sources/editor/graphicspart/partellipse.cpp | 7 +- sources/editor/graphicspart/partline.cpp | 9 +- sources/editor/graphicspart/partline.h | 2 +- sources/editor/graphicspart/partpolygon.cpp | 12 +- sources/editor/graphicspart/partrectangle.cpp | 7 +- sources/editor/graphicspart/parttext.cpp | 7 +- sources/editor/graphicspart/parttext.h | 5 +- sources/editor/qetelementeditor.cpp | 21 +- sources/editor/styleeditor.cpp | 10 +- sources/editor/terminaleditor.cpp | 10 +- sources/editor/ui/dynamictextfieldeditor.cpp | 19 +- .../ui/elementpropertieseditorwidget.cpp | 5 +- .../editor/ui/elementpropertieseditorwidget.h | 5 +- sources/editor/ui/ellipseeditor.cpp | 7 +- sources/editor/ui/lineeditor.cpp | 11 +- sources/editor/ui/polygoneditor.cpp | 9 +- sources/editor/ui/rectangleeditor.cpp | 11 +- sources/editor/ui/texteditor.cpp | 6 +- sources/factory/ui/addtabledialog.h | 4 +- sources/print/projectprintwindow.h | 4 +- sources/properties/terminaldata.h | 4 +- sources/properties/xrefproperties.cpp | 9 +- .../ViewItem/qetgraphicsheaderitem.h | 4 +- .../ViewItem/qetgraphicstableitem.cpp | 4 +- .../ui/graphicstablepropertieseditor.h | 5 +- .../ui/projectdbmodelpropertieswidget.h | 2 +- sources/qetgraphicsitem/conductor.cpp | 12 +- sources/qetgraphicsitem/conductortextitem.cpp | 2 +- sources/qetgraphicsitem/crossrefitem.h | 8 +- sources/qetgraphicsitem/slaveelement.h | 2 +- sources/titleblock/helpercell.h | 3 +- .../integrationmovetemplateshandler.cpp | 3 +- sources/titleblock/qettemplateeditor.cpp | 12 +- sources/titleblock/templatecellsset.cpp | 9 +- sources/titleblock/templatecellwidget.h | 3 +- sources/titleblock/templatecommands.cpp | 7 +- sources/titleblock/templatecommands.h | 7 +- sources/titleblock/templatedeleter.cpp | 5 +- sources/titleblock/templatelogomanager.cpp | 5 +- sources/titleblock/templateview.cpp | 9 +- sources/titleblock/templateview.h | 3 +- sources/titleblock/templatevisualcell.cpp | 2 +- sources/titleblock/templatevisualcell.h | 5 +- sources/ui/aboutqetdialog.cpp | 8 +- .../abstractelementpropertieseditorwidget.h | 3 +- .../configpage/generalconfigurationpage.cpp | 11 +- .../ui/configpage/generalconfigurationpage.h | 3 +- sources/ui/imagepropertieswidget.h | 2 +- sources/ui/inditextpropertieswidget.h | 3 +- sources/ui/masterpropertieswidget.cpp | 12 +- .../ui/shapegraphicsitempropertieswidget.h | 2 +- sources/undocommand/rotatetextscommand.cpp | 2 +- sources/utils/macosxopenevent.cpp | 4 +- tests/catch/CMakeLists.txt | 58 +++-- tests/googlemock/CMakeLists.txt | 53 ++++- tests/googletest/CMakeLists.txt | 56 ++++- tests/qttest/CMakeLists.txt | 63 +++-- 78 files changed, 589 insertions(+), 327 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 953b29551..57ab521e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,10 +41,14 @@ project(qelectrotech HOMEPAGE_URL "https://qelectrotech.org/" LANGUAGES CXX) +set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) + SET(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) set(QET_DIR ${PROJECT_SOURCE_DIR}) @@ -57,8 +61,37 @@ message("PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR}) message("QET_DIR: " ${QET_DIR}) message("GIT_COMMIT_SHA: " ${GIT_COMMIT_SHA}) -find_package(KF5WidgetsAddons) + +Include(FetchContent) + find_package(KF5CoreAddons) +#---ToDo why you don't work :/ +#FetchContent_Declare( +# kcoreaddons +# GIT_REPOSITORY https://invent.kde.org/frameworks/kcoreaddons.git +# GIT_TAG v5.76.0) +#FetchContent_MakeAvailable(kcoreaddons) +#___ToDo + +#find_package(KF5WidgetsAddons) +FetchContent_Declare( + kwidgetsaddons + GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git + GIT_TAG v5.76.0) + +FetchContent_MakeAvailable(kwidgetsaddons) + + + +set(QET_COMPONENTS + Widgets + Concurrent + Xml + Svg + Network + Sql + PrintSupport + LinguistTools) find_package( QT @@ -66,28 +99,51 @@ find_package( Qt6 Qt5 COMPONENTS - Widgets - Concurrent - Xml - Svg - Network - Sql - PrintSupport + ${QET_COMPONENTS} REQUIRED ) find_package( Qt${QT_VERSION_MAJOR} COMPONENTS - Widgets - Concurrent - Xml - Svg - Network - Sql - PrintSupport - REQUIRED - ) + ${QET_COMPONENTS} + REQUIRED) + +qt5_create_translation( + QM_FILES + ${QET_DIR}/lang/qet_ca.ts + ${QET_DIR}/lang/qet_de.ts + ${QET_DIR}/lang/qet_es.ts + ${QET_DIR}/lang/qet_fr.ts + ${QET_DIR}/lang/qet_it.ts + ${QET_DIR}/lang/qet_mn.ts + ${QET_DIR}/lang/qet_pt_br.ts + ${QET_DIR}/lang/qet_ru.ts + ${QET_DIR}/lang/qet_sr.ts + ${QET_DIR}/lang/qet_zh.ts + ${QET_DIR}/lang/qet_be.ts + ${QET_DIR}/lang/qet_da.ts + ${QET_DIR}/lang/qet_en.ts + ${QET_DIR}/lang/qet_fi.ts + ${QET_DIR}/lang/qet_hu.ts + ${QET_DIR}/lang/qet_nl.ts + ${QET_DIR}/lang/qet_pl.ts + ${QET_DIR}/lang/qet_ro.ts + ${QET_DIR}/lang/qet_sk.ts + ${QET_DIR}/lang/qet_ar.ts + ${QET_DIR}/lang/qet_cs.ts + ${QET_DIR}/lang/qet_el.ts + ${QET_DIR}/lang/qet_hr.ts + ${QET_DIR}/lang/qet_ja.ts + ${QET_DIR}/lang/qet_nb.ts + ${QET_DIR}/lang/qet_no.ts + ${QET_DIR}/lang/qet_pt.ts + ${QET_DIR}/lang/qet_sl.ts + ${QET_DIR}/lang/qet_tr.ts) + + +message("QT_VERSION_MAJOR :" ${QT_VERSION_MAJOR}) + set(QET_SRC_FILES ${QET_DIR}/sources/borderproperties.cpp ${QET_DIR}/sources/borderproperties.h @@ -598,63 +654,77 @@ set(QET_SRC_FILES ${QET_DIR}/sources/utils/qetutils.cpp ${QET_DIR}/sources/utils/qetutils.h ) -if(DEFINED ENV{ok_simon}) -add_executable( - ${PROJECT_NAME} - ${QET_SRC_FILES} - ) -target_link_libraries( - ${PROJECT_NAME} - PUBLIC - Qt${QT_VERSION_MAJOR}::Xml - Qt${QT_VERSION_MAJOR}::Svg - Qt${QT_VERSION_MAJOR}::Network - Qt${QT_VERSION_MAJOR}::Sql - Qt${QT_VERSION_MAJOR}::PrintSupport - KF5::WidgetsAddons - KF5::CoreAddons - PRIVATE - Qt${QT_VERSION_MAJOR}::Widgets - Qt${QT_VERSION_MAJOR}::Concurrent) - target_include_directories( - ${PROJECT_NAME} - PRIVATE - ${PROJECT_SOURCE_DIR}/sources/titleblock - ${PROJECT_SOURCE_DIR}/sources/ui - ${PROJECT_SOURCE_DIR}/sources/qetgraphicsitem - ${PROJECT_SOURCE_DIR}/sources/qetgraphicsitem/ViewItem - ${PROJECT_SOURCE_DIR}/sources/qetgraphicsitem/ViewItem/ui - ${PROJECT_SOURCE_DIR}/sources/richtext - ${PROJECT_SOURCE_DIR}/sources/factory - ${PROJECT_SOURCE_DIR}/sources/properties - ${PROJECT_SOURCE_DIR}/sources/dvevent - ${PROJECT_SOURCE_DIR}/sources/editor - ${PROJECT_SOURCE_DIR}/sources/editor/esevent - ${PROJECT_SOURCE_DIR}/sources/editor/graphicspart - ${PROJECT_SOURCE_DIR}/sources/editor/ui - ${PROJECT_SOURCE_DIR}/sources/editor/UndoCommand - ${PROJECT_SOURCE_DIR}/sources/undocommand - ${PROJECT_SOURCE_DIR}/sources/diagramevent - ${PROJECT_SOURCE_DIR}/sources/ElementsCollection - ${PROJECT_SOURCE_DIR}/sources/ElementsCollection/ui - ${PROJECT_SOURCE_DIR}/sources/autoNum - ${PROJECT_SOURCE_DIR}/sources/autoNum/ui - ${PROJECT_SOURCE_DIR}/sources/ui/configpage - ${PROJECT_SOURCE_DIR}/sources/SearchAndReplace - ${PROJECT_SOURCE_DIR}/sources/SearchAndReplace/ui - ${PROJECT_SOURCE_DIR}/sources/NameList - ${PROJECT_SOURCE_DIR}/sources/NameList/ui - ${PROJECT_SOURCE_DIR}/sources/utils - ${PROJECT_SOURCE_DIR}/sources/pugixml - ${PROJECT_SOURCE_DIR}/sources/dataBase - ${PROJECT_SOURCE_DIR}/sources/dataBase/ui - ${PROJECT_SOURCE_DIR}/sources/factory/ui - ${PROJECT_SOURCE_DIR}/sources/print - ) - else() - message("ok_simon is not set, assuming QET WILL_FAIL to COMPILE") -endif() +#add_executable( +# ${PROJECT_NAME} +# ${QET_SRC_FILES} +# ${QM_FILES} +# ) + +#target_link_libraries( +# ${PROJECT_NAME} +# PUBLIC +# PRIVATE +# Qt${QT_VERSION_MAJOR}::Xml +# Qt${QT_VERSION_MAJOR}::Svg +# Qt${QT_VERSION_MAJOR}::Network +# Qt${QT_VERSION_MAJOR}::Sql +# Qt${QT_VERSION_MAJOR}::PrintSupport +# Qt${QT_VERSION_MAJOR}::Widgets +# Qt${QT_VERSION_MAJOR}::Concurrent +# KF5::WidgetsAddons +# KF5::CoreAddons) + +#target_link_libraries( +# ${PROJECT_NAME} +# PUBLIC +# PRIVATE +# KF5::WidgetsAddons +# KF5::CoreAddons +# Qt5::Gui +# Qt5::Xml +# Qt5::Svg +# Qt5::Network +# Qt5::Sql +# Qt5::Widgets +# Qt5::Concurrent) + +# target_include_directories( +# ${PROJECT_NAME} +# PRIVATE +# ${QET_DIR}/sources/titleblock +# ${QET_DIR}/sources/ui +# ${QET_DIR}/sources/qetgraphicsitem +# ${QET_DIR}/sources/qetgraphicsitem/ViewItem +# ${QET_DIR}/sources/qetgraphicsitem/ViewItem/ui +# ${QET_DIR}/sources/richtext +# ${QET_DIR}/sources/factory +# ${QET_DIR}/sources/properties +# ${QET_DIR}/sources/dvevent +# ${QET_DIR}/sources/editor +# ${QET_DIR}/sources/editor/esevent +# ${QET_DIR}/sources/editor/graphicspart +# ${QET_DIR}/sources/editor/ui +# ${QET_DIR}/sources/editor/UndoCommand +# ${QET_DIR}/sources/undocommand +# ${QET_DIR}/sources/diagramevent +# ${QET_DIR}/sources/ElementsCollection +# ${QET_DIR}/sources/ElementsCollection/ui +# ${QET_DIR}/sources/autoNum +# ${QET_DIR}/sources/autoNum/ui +# ${QET_DIR}/sources/ui/configpage +# ${QET_DIR}/sources/SearchAndReplace +# ${QET_DIR}/sources/SearchAndReplace/ui +# ${QET_DIR}/sources/NameList +# ${QET_DIR}/sources/NameList/ui +# ${QET_DIR}/sources/utils +# ${QET_DIR}/sources/pugixml +# ${QET_DIR}/sources/dataBase +# ${QET_DIR}/sources/dataBase/ui +# ${QET_DIR}/sources/factory/ui +# ${QET_DIR}/sources/print +# ) + # Add sub directories diff --git a/sources/ElementsCollection/elementcollectionhandler.cpp b/sources/ElementsCollection/elementcollectionhandler.cpp index b438a144e..e64ee1219 100644 --- a/sources/ElementsCollection/elementcollectionhandler.cpp +++ b/sources/ElementsCollection/elementcollectionhandler.cpp @@ -16,12 +16,14 @@ along with QElectroTech. If not, see . */ #include "elementcollectionhandler.h" + +#include "../qetproject.h" +#include "../qetxml.h" #include "renamedialog.h" #include "xmlelementcollection.h" -#include "qetproject.h" -#include "qetxml.h" -#include + #include +#include /******************************************************/ diff --git a/sources/ElementsCollection/elementslocation.cpp b/sources/ElementsCollection/elementslocation.cpp index bf35bb2ef..fff5ac9df 100644 --- a/sources/ElementsCollection/elementslocation.cpp +++ b/sources/ElementsCollection/elementslocation.cpp @@ -16,13 +16,15 @@ along with QElectroTech. If not, see . */ #include "elementslocation.h" -#include "qetapp.h" -#include "xmlelementcollection.h" -#include "qetproject.h" -#include "elementscollectioncache.h" -#include "elementpicturefactory.h" + +#include "../elementscollectioncache.h" +#include "../qetapp.h" +#include "../qetproject.h" +#include "../qetxml.h" #include "element.h" -#include "qetxml.h" +#include "elementpicturefactory.h" +#include "xmlelementcollection.h" + #include // make this class usable with QVariant diff --git a/sources/ElementsCollection/elementstreeview.cpp b/sources/ElementsCollection/elementstreeview.cpp index 90d93e5bc..a17e682b6 100644 --- a/sources/ElementsCollection/elementstreeview.cpp +++ b/sources/ElementsCollection/elementstreeview.cpp @@ -18,10 +18,10 @@ #include "elementstreeview.h" #include "../qetgraphicsitem/element.h" +#include "../qeticons.h" #include "elementcollectionitem.h" #include "elementfactory.h" #include "elementslocation.h" -#include "qeticons.h" #include #include diff --git a/sources/ElementsCollection/fileelementcollectionitem.cpp b/sources/ElementsCollection/fileelementcollectionitem.cpp index 7cf06651f..7f4c84227 100644 --- a/sources/ElementsCollection/fileelementcollectionitem.cpp +++ b/sources/ElementsCollection/fileelementcollectionitem.cpp @@ -17,9 +17,10 @@ */ #include "fileelementcollectionitem.h" + +#include "../qetapp.h" +#include "../qeticons.h" #include "elementslocation.h" -#include "qetapp.h" -#include "qeticons.h" #include diff --git a/sources/ElementsCollection/ui/renamedialog.h b/sources/ElementsCollection/ui/renamedialog.h index 9f22d2ae5..568834ceb 100644 --- a/sources/ElementsCollection/ui/renamedialog.h +++ b/sources/ElementsCollection/ui/renamedialog.h @@ -18,8 +18,9 @@ #ifndef RENAMEDIALOG_H #define RENAMEDIALOG_H +#include "../qet.h" + #include -#include "qet.h" namespace Ui { class RenameDialog; diff --git a/sources/ElementsCollection/xmlprojectelementcollectionitem.cpp b/sources/ElementsCollection/xmlprojectelementcollectionitem.cpp index 1cb206300..f0fa3931b 100644 --- a/sources/ElementsCollection/xmlprojectelementcollectionitem.cpp +++ b/sources/ElementsCollection/xmlprojectelementcollectionitem.cpp @@ -15,11 +15,12 @@ You should have received a copy of the GNU General Public License along with QElectroTech. If not, see . */ -#include "qetproject.h" -#include "xmlelementcollection.h" -#include "qeticons.h" #include "xmlprojectelementcollectionitem.h" +#include "../qeticons.h" +#include "../qetproject.h" +#include "xmlelementcollection.h" + /** @brief XmlProjectElementCollectionItem::XmlProjectElementCollectionItem Constructor diff --git a/sources/SearchAndReplace/ui/replaceadvanceddialog.cpp b/sources/SearchAndReplace/ui/replaceadvanceddialog.cpp index a1bf5337a..f956179fe 100644 --- a/sources/SearchAndReplace/ui/replaceadvanceddialog.cpp +++ b/sources/SearchAndReplace/ui/replaceadvanceddialog.cpp @@ -16,9 +16,10 @@ along with QElectroTech. If not, see . */ #include "replaceadvanceddialog.h" + +#include "../qetapp.h" +#include "../qetinformation.h" #include "ui_replaceadvanceddialog.h" -#include "qetapp.h" -#include "qetinformation.h" #include diff --git a/sources/SearchAndReplace/ui/replaceelementdialog.cpp b/sources/SearchAndReplace/ui/replaceelementdialog.cpp index eecd51de9..cef50845e 100644 --- a/sources/SearchAndReplace/ui/replaceelementdialog.cpp +++ b/sources/SearchAndReplace/ui/replaceelementdialog.cpp @@ -16,12 +16,13 @@ along with QElectroTech. If not, see . */ #include "replaceelementdialog.h" -#include "ui_replaceelementdialog.h" -#include "replaceelementdialog.h" + +#include "../qetapp.h" +#include "../qetinformation.h" #include "elementinfopartwidget.h" -#include "qetapp.h" +#include "replaceelementdialog.h" #include "searchandreplaceworker.h" -#include "qetinformation.h" +#include "ui_replaceelementdialog.h" #include diff --git a/sources/dataBase/ui/elementquerywidget.cpp b/sources/dataBase/ui/elementquerywidget.cpp index 6bfaf0cdd..0b937a591 100644 --- a/sources/dataBase/ui/elementquerywidget.cpp +++ b/sources/dataBase/ui/elementquerywidget.cpp @@ -16,9 +16,10 @@ along with QElectroTech. If not, see . */ #include "elementquerywidget.h" + +#include "../qetapp.h" +#include "../qetinformation.h" #include "ui_elementquerywidget.h" -#include "qetapp.h" -#include "qetinformation.h" #include diff --git a/sources/dataBase/ui/summaryquerywidget.cpp b/sources/dataBase/ui/summaryquerywidget.cpp index 2a33832d1..cd952646d 100644 --- a/sources/dataBase/ui/summaryquerywidget.cpp +++ b/sources/dataBase/ui/summaryquerywidget.cpp @@ -16,9 +16,10 @@ along with QElectroTech. If not, see . */ #include "summaryquerywidget.h" + +#include "../qetapp.h" +#include "../qetinformation.h" #include "ui_summaryquerywidget.h" -#include "qetapp.h" -#include "qetinformation.h" #include diff --git a/sources/dvevent/dveventinterface.cpp b/sources/dvevent/dveventinterface.cpp index c6000da25..27b558a3d 100644 --- a/sources/dvevent/dveventinterface.cpp +++ b/sources/dvevent/dveventinterface.cpp @@ -16,7 +16,9 @@ along with QElectroTech. If not, see . */ #include "dveventinterface.h" -#include "diagramview.h" + +#include "../diagramview.h" + #include DVEventInterface::DVEventInterface(DiagramView *dv) : diff --git a/sources/editor/arceditor.cpp b/sources/editor/arceditor.cpp index 0506be59d..bbc581989 100644 --- a/sources/editor/arceditor.cpp +++ b/sources/editor/arceditor.cpp @@ -16,10 +16,11 @@ along with QElectroTech. If not, see . */ #include "arceditor.h" -#include "styleeditor.h" -#include "partarc.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" + +#include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "elementscene.h" +#include "partarc.h" +#include "styleeditor.h" /** Constructeur diff --git a/sources/editor/editorcommands.h b/sources/editor/editorcommands.h index b560a97d8..af7628b99 100644 --- a/sources/editor/editorcommands.h +++ b/sources/editor/editorcommands.h @@ -17,11 +17,11 @@ */ #ifndef EDITOR_COMMANDS_H #define EDITOR_COMMANDS_H +#include "../qgimanager.h" #include "customelementpart.h" -#include "elementview.h" -#include "elementscene.h" #include "elementcontent.h" -#include "qgimanager.h" +#include "elementscene.h" +#include "elementview.h" /** @brief The ElementEditionCommand class diff --git a/sources/editor/elementprimitivedecorator.cpp b/sources/editor/elementprimitivedecorator.cpp index 69c84bcbe..97eef726c 100644 --- a/sources/editor/elementprimitivedecorator.cpp +++ b/sources/editor/elementprimitivedecorator.cpp @@ -16,15 +16,17 @@ along with QElectroTech. If not, see . */ #include "elementprimitivedecorator.h" -#include "elementscene.h" + +#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h" +#include "../qet.h" #include "customelementpart.h" #include "editorcommands.h" -#include "qet.h" -#include -#include -#include +#include "elementscene.h" + #include -#include "QetGraphicsItemModeler/qetgraphicshandleritem.h" +#include +#include +#include /** Constructor diff --git a/sources/editor/elementprimitivedecorator.h b/sources/editor/elementprimitivedecorator.h index 1ec82cc37..c098c32a2 100644 --- a/sources/editor/elementprimitivedecorator.h +++ b/sources/editor/elementprimitivedecorator.h @@ -18,8 +18,9 @@ #ifndef ELEMENTPRIMITIVEDECORATOR_H #define ELEMENTPRIMITIVEDECORATOR_H +#include "../qet.h" + #include -#include "qet.h" class ElementEditionCommand; class ElementScene; diff --git a/sources/editor/elementview.cpp b/sources/editor/elementview.cpp index 9117da8d4..a931362ab 100644 --- a/sources/editor/elementview.cpp +++ b/sources/editor/elementview.cpp @@ -16,9 +16,10 @@ along with QElectroTech. If not, see . */ #include "elementview.h" -#include "qetelementeditor.h" -#include "qetapp.h" + +#include "../qetapp.h" #include "pastepartscommand.h" +#include "qetelementeditor.h" /** Constructeur @param scene ElementScene visualisee par cette ElementView diff --git a/sources/editor/graphicspart/customelementgraphicpart.cpp b/sources/editor/graphicspart/customelementgraphicpart.cpp index b804fdee6..eae184a80 100644 --- a/sources/editor/graphicspart/customelementgraphicpart.cpp +++ b/sources/editor/graphicspart/customelementgraphicpart.cpp @@ -16,8 +16,9 @@ along with QElectroTech. If not, see . */ #include "customelementgraphicpart.h" + +#include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "elementscene.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" #include diff --git a/sources/editor/graphicspart/customelementpart.h b/sources/editor/graphicspart/customelementpart.h index 9f3eaddc7..f254a1463 100644 --- a/sources/editor/graphicspart/customelementpart.h +++ b/sources/editor/graphicspart/customelementpart.h @@ -18,7 +18,7 @@ #ifndef CUSTOM_ELEMENT_PART_H #define CUSTOM_ELEMENT_PART_H -#include "qet.h" +#include "../qet.h" class CustomElement; class ElementPrimitiveDecorator; diff --git a/sources/editor/graphicspart/partarc.cpp b/sources/editor/graphicspart/partarc.cpp index 1b3430d8c..ac9321a9a 100644 --- a/sources/editor/graphicspart/partarc.cpp +++ b/sources/editor/graphicspart/partarc.cpp @@ -16,11 +16,11 @@ along with QElectroTech. If not, see . */ #include "partarc.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" -#include "elementscene.h" -#include "QetGraphicsItemModeler/qetgraphicshandleritem.h" -#include "QetGraphicsItemModeler/qetgraphicshandlerutility.h" +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h" +#include "../QetGraphicsItemModeler/qetgraphicshandlerutility.h" +#include "elementscene.h" /** @brief PartArc::PartArc diff --git a/sources/editor/graphicspart/partdynamictextfield.cpp b/sources/editor/graphicspart/partdynamictextfield.cpp index a425628d3..1f3b446a5 100644 --- a/sources/editor/graphicspart/partdynamictextfield.cpp +++ b/sources/editor/graphicspart/partdynamictextfield.cpp @@ -16,13 +16,14 @@ along with QElectroTech. If not, see . */ #include "partdynamictextfield.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" -#include "qetapp.h" + +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../qetapp.h" #include "elementscene.h" -#include -#include #include +#include +#include PartDynamicTextField::PartDynamicTextField(QETElementEditor *editor, QGraphicsItem *parent) : QGraphicsTextItem(parent), diff --git a/sources/editor/graphicspart/partellipse.cpp b/sources/editor/graphicspart/partellipse.cpp index c121e6135..752b07fd6 100644 --- a/sources/editor/graphicspart/partellipse.cpp +++ b/sources/editor/graphicspart/partellipse.cpp @@ -16,10 +16,11 @@ along with QElectroTech. If not, see . */ #include "partellipse.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" + +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h" +#include "../QetGraphicsItemModeler/qetgraphicshandlerutility.h" #include "elementscene.h" -#include "QetGraphicsItemModeler/qetgraphicshandleritem.h" -#include "QetGraphicsItemModeler/qetgraphicshandlerutility.h" /** @brief PartEllipse::PartEllipse diff --git a/sources/editor/graphicspart/partline.cpp b/sources/editor/graphicspart/partline.cpp index 304406e2e..3dc5080a9 100644 --- a/sources/editor/graphicspart/partline.cpp +++ b/sources/editor/graphicspart/partline.cpp @@ -16,11 +16,12 @@ along with QElectroTech. If not, see . */ #include "partline.h" -#include -#include "elementscene.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" -#include "QetGraphicsItemModeler/qetgraphicshandleritem.h" +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h" +#include "elementscene.h" + +#include /** @brief PartLine::PartLine diff --git a/sources/editor/graphicspart/partline.h b/sources/editor/graphicspart/partline.h index 589335ba2..9b78be296 100644 --- a/sources/editor/graphicspart/partline.h +++ b/sources/editor/graphicspart/partline.h @@ -18,8 +18,8 @@ #ifndef PART_LINE_H #define PART_LINE_H +#include "../qet.h" #include "customelementgraphicpart.h" -#include "qet.h" class QPropertyUndoCommand; class QetGraphicsHandlerItem; diff --git a/sources/editor/graphicspart/partpolygon.cpp b/sources/editor/graphicspart/partpolygon.cpp index 89e21beb9..af7f7b909 100644 --- a/sources/editor/graphicspart/partpolygon.cpp +++ b/sources/editor/graphicspart/partpolygon.cpp @@ -16,13 +16,13 @@ along with QElectroTech. If not, see . */ #include "partpolygon.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" -#include "elementscene.h" -#include "QetGraphicsItemModeler/qetgraphicshandleritem.h" -#include "qetelementeditor.h" -#include "qeticons.h" -#include "QetGraphicsItemModeler/qetgraphicshandlerutility.h" +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h" +#include "../QetGraphicsItemModeler/qetgraphicshandlerutility.h" +#include "../qeticons.h" +#include "elementscene.h" +#include "qetelementeditor.h" /** @brief PartPolygon::PartPolygon diff --git a/sources/editor/graphicspart/partrectangle.cpp b/sources/editor/graphicspart/partrectangle.cpp index b087829cd..7c84e8011 100644 --- a/sources/editor/graphicspart/partrectangle.cpp +++ b/sources/editor/graphicspart/partrectangle.cpp @@ -16,10 +16,11 @@ along with QElectroTech. If not, see . */ #include "partrectangle.h" + +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h" +#include "../QetGraphicsItemModeler/qetgraphicshandlerutility.h" #include "elementscene.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" -#include "QetGraphicsItemModeler/qetgraphicshandleritem.h" -#include "QetGraphicsItemModeler/qetgraphicshandlerutility.h" /** @brief PartRectangle::PartRectangle diff --git a/sources/editor/graphicspart/parttext.cpp b/sources/editor/graphicspart/parttext.cpp index 497d66b31..0b020ebba 100644 --- a/sources/editor/graphicspart/parttext.cpp +++ b/sources/editor/graphicspart/parttext.cpp @@ -16,11 +16,12 @@ along with QElectroTech. If not, see . */ #include "parttext.h" -#include "texteditor.h" + +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../qetapp.h" #include "elementprimitivedecorator.h" #include "elementscene.h" -#include "qetapp.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" +#include "texteditor.h" /** Constructeur diff --git a/sources/editor/graphicspart/parttext.h b/sources/editor/graphicspart/parttext.h index cdadfbfab..fba95ca39 100644 --- a/sources/editor/graphicspart/parttext.h +++ b/sources/editor/graphicspart/parttext.h @@ -17,9 +17,10 @@ */ #ifndef PART_TEXT_H #define PART_TEXT_H -#include +#include "../qetapp.h" #include "customelementpart.h" -#include "qetapp.h" + +#include class TextEditor; class ElementPrimitiveDecorator; diff --git a/sources/editor/qetelementeditor.cpp b/sources/editor/qetelementeditor.cpp index 034abde7a..531e00ccc 100644 --- a/sources/editor/qetelementeditor.cpp +++ b/sources/editor/qetelementeditor.cpp @@ -16,18 +16,19 @@ along with QElectroTech. If not, see . */ #include "qetelementeditor.h" -#include "qet.h" -#include "qetapp.h" + +#include "../elementdialog.h" +#include "../newelementwizard.h" +#include "../qet.h" +#include "../qetapp.h" +#include "../qeticons.h" +#include "../qetmessagebox.h" +#include "../recentfiles.h" +#include "customelementpart.h" +#include "editorcommands.h" +#include "elementitemeditor.h" #include "elementscene.h" #include "elementview.h" -#include "customelementpart.h" -#include "newelementwizard.h" -#include "elementitemeditor.h" -#include "elementdialog.h" -#include "recentfiles.h" -#include "qeticons.h" -#include "qetmessagebox.h" -#include "editorcommands.h" // editeurs de primitives #include "arceditor.h" diff --git a/sources/editor/styleeditor.cpp b/sources/editor/styleeditor.cpp index 3a2f4d2e4..40c82dc6b 100644 --- a/sources/editor/styleeditor.cpp +++ b/sources/editor/styleeditor.cpp @@ -16,13 +16,15 @@ along with QElectroTech. If not, see . */ #include "styleeditor.h" + +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../qeticons.h" #include "customelementgraphicpart.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" -#include "qeticons.h" -#include + #include -#include +#include #include +#include /** Constructeur diff --git a/sources/editor/terminaleditor.cpp b/sources/editor/terminaleditor.cpp index 9c38e4db3..7c4621604 100644 --- a/sources/editor/terminaleditor.cpp +++ b/sources/editor/terminaleditor.cpp @@ -16,14 +16,16 @@ along with QElectroTech. If not, see . */ #include "terminaleditor.h" + +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../qeticons.h" #include "partterminal.h" -#include "qeticons.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" -#include + #include -#include +#include #include #include +#include /** @brief TerminalEditor::TerminalEditor diff --git a/sources/editor/ui/dynamictextfieldeditor.cpp b/sources/editor/ui/dynamictextfieldeditor.cpp index dc1a53f16..c7b817381 100644 --- a/sources/editor/ui/dynamictextfieldeditor.cpp +++ b/sources/editor/ui/dynamictextfieldeditor.cpp @@ -16,20 +16,21 @@ along with QElectroTech. If not, see . */ #include "dynamictextfieldeditor.h" -#include "ui_dynamictextfieldeditor.h" + +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../qetapp.h" +#include "../qetinformation.h" +#include "alignmenttextdialog.h" +#include "compositetexteditdialog.h" #include "customelementpart.h" #include "partdynamictextfield.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" #include "qetelementeditor.h" -#include "qetapp.h" -#include "compositetexteditdialog.h" -#include "alignmenttextdialog.h" -#include "qetinformation.h" -#include +#include "ui_dynamictextfieldeditor.h" -#include -#include #include +#include +#include +#include DynamicTextFieldEditor::DynamicTextFieldEditor( QETElementEditor *editor, PartDynamicTextField *text_field, QWidget *parent) : diff --git a/sources/editor/ui/elementpropertieseditorwidget.cpp b/sources/editor/ui/elementpropertieseditorwidget.cpp index 002a1b692..cccdfc749 100644 --- a/sources/editor/ui/elementpropertieseditorwidget.cpp +++ b/sources/editor/ui/elementpropertieseditorwidget.cpp @@ -16,9 +16,10 @@ along with QElectroTech. If not, see . */ #include "elementpropertieseditorwidget.h" + +#include "../qetapp.h" +#include "../qetinformation.h" #include "ui_elementpropertieseditorwidget.h" -#include "qetapp.h" -#include "qetinformation.h" #include diff --git a/sources/editor/ui/elementpropertieseditorwidget.h b/sources/editor/ui/elementpropertieseditorwidget.h index ca0337ca4..ccc637a7b 100644 --- a/sources/editor/ui/elementpropertieseditorwidget.h +++ b/sources/editor/ui/elementpropertieseditorwidget.h @@ -18,9 +18,10 @@ #ifndef ELEMENTPROPERTIESEDITORWIDGET_H #define ELEMENTPROPERTIESEDITORWIDGET_H -#include +#include "../diagramcontext.h" + #include -#include "diagramcontext.h" +#include namespace Ui { class ElementPropertiesEditorWidget; diff --git a/sources/editor/ui/ellipseeditor.cpp b/sources/editor/ui/ellipseeditor.cpp index 5f2cb65cd..a44e0bd15 100644 --- a/sources/editor/ui/ellipseeditor.cpp +++ b/sources/editor/ui/ellipseeditor.cpp @@ -16,11 +16,12 @@ along with QElectroTech. If not, see . */ #include "ellipseeditor.h" -#include "ui_ellipseeditor.h" + +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "elementscene.h" #include "partellipse.h" #include "styleeditor.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" -#include "elementscene.h" +#include "ui_ellipseeditor.h" /** * @brief EllipseEditor::EllipseEditor diff --git a/sources/editor/ui/lineeditor.cpp b/sources/editor/ui/lineeditor.cpp index a6eef0fbe..c1af44861 100644 --- a/sources/editor/ui/lineeditor.cpp +++ b/sources/editor/ui/lineeditor.cpp @@ -16,13 +16,14 @@ along with QElectroTech. If not, see . */ #include "lineeditor.h" -#include "ui_lineeditor.h" + +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../qeticons.h" #include "elementitemeditor.h" -#include "styleeditor.h" -#include "partline.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" #include "elementscene.h" -#include "qeticons.h" +#include "partline.h" +#include "styleeditor.h" +#include "ui_lineeditor.h" /** @brief LineEditor::LineEditor diff --git a/sources/editor/ui/polygoneditor.cpp b/sources/editor/ui/polygoneditor.cpp index ab1d6c07f..93295a507 100644 --- a/sources/editor/ui/polygoneditor.cpp +++ b/sources/editor/ui/polygoneditor.cpp @@ -16,12 +16,13 @@ along with QElectroTech. If not, see . */ #include "polygoneditor.h" -#include "ui_polygoneditor.h" -#include "partpolygon.h" + +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../qetmessagebox.h" #include "elementscene.h" -#include "qetmessagebox.h" +#include "partpolygon.h" #include "styleeditor.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" +#include "ui_polygoneditor.h" /** @brief PolygonEditor::PolygonEditor diff --git a/sources/editor/ui/rectangleeditor.cpp b/sources/editor/ui/rectangleeditor.cpp index 1bbc500c5..95e366931 100644 --- a/sources/editor/ui/rectangleeditor.cpp +++ b/sources/editor/ui/rectangleeditor.cpp @@ -16,12 +16,13 @@ along with QElectroTech. If not, see . */ #include "rectangleeditor.h" -#include "ui_rectangleeditor.h" -#include "styleeditor.h" -#include "partrectangle.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" + +#include "../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../qeticons.h" #include "elementscene.h" -#include "qeticons.h" +#include "partrectangle.h" +#include "styleeditor.h" +#include "ui_rectangleeditor.h" /** @brief RectangleEditor::RectangleEditor diff --git a/sources/editor/ui/texteditor.cpp b/sources/editor/ui/texteditor.cpp index 626cff20a..ffbbf56f1 100644 --- a/sources/editor/ui/texteditor.cpp +++ b/sources/editor/ui/texteditor.cpp @@ -16,9 +16,11 @@ along with QElectroTech. If not, see . */ #include "texteditor.h" -#include "ui_texteditor.h" + +#include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "parttext.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" +#include "ui_texteditor.h" + #include /** diff --git a/sources/factory/ui/addtabledialog.h b/sources/factory/ui/addtabledialog.h index 4d16795ec..a2d6053b0 100644 --- a/sources/factory/ui/addtabledialog.h +++ b/sources/factory/ui/addtabledialog.h @@ -18,9 +18,9 @@ #ifndef ADDTABLEDIALOG_H #define ADDTABLEDIALOG_H -#include +#include "../qetapp.h" -#include "qetapp.h" +#include namespace Ui { class AddTableDialog; diff --git a/sources/print/projectprintwindow.h b/sources/print/projectprintwindow.h index 953d7dd84..cd85d6177 100644 --- a/sources/print/projectprintwindow.h +++ b/sources/print/projectprintwindow.h @@ -18,9 +18,9 @@ #ifndef PROJECTPRINTWINDOW_H #define PROJECTPRINTWINDOW_H -#include +#include "../exportproperties.h" -#include "exportproperties.h" +#include #include namespace Ui { diff --git a/sources/properties/terminaldata.h b/sources/properties/terminaldata.h index f54344e61..833c90fe0 100644 --- a/sources/properties/terminaldata.h +++ b/sources/properties/terminaldata.h @@ -1,11 +1,11 @@ #ifndef TERMINALDATA_H #define TERMINALDATA_H +#include "../qet.h" #include "propertiesinterface.h" -#include "qet.h" -#include #include +#include class QGraphicsObject; diff --git a/sources/properties/xrefproperties.cpp b/sources/properties/xrefproperties.cpp index dd864f5b0..b30afbe07 100644 --- a/sources/properties/xrefproperties.cpp +++ b/sources/properties/xrefproperties.cpp @@ -15,11 +15,12 @@ You should have received a copy of the GNU General Public License along with QElectroTech. If not, see . */ -#include -#include - #include "xrefproperties.h" -#include "qetapp.h" + +#include "../qetapp.h" + +#include +#include /** @brief XRefProperties::XRefProperties diff --git a/sources/qetgraphicsitem/ViewItem/qetgraphicsheaderitem.h b/sources/qetgraphicsitem/ViewItem/qetgraphicsheaderitem.h index 9fbd6bca8..b66b3a193 100644 --- a/sources/qetgraphicsitem/ViewItem/qetgraphicsheaderitem.h +++ b/sources/qetgraphicsitem/ViewItem/qetgraphicsheaderitem.h @@ -18,10 +18,10 @@ #ifndef QETGRAPHICSHEADERITEM_H #define QETGRAPHICSHEADERITEM_H -#include "qetapp.h" +#include "../qetapp.h" -#include #include +#include #include class QAbstractItemModel; diff --git a/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp b/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp index 906f5d5ce..e97ceb140 100644 --- a/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp +++ b/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp @@ -18,11 +18,11 @@ #include "qetgraphicstableitem.h" #include "../../QPropertyUndoCommand/qpropertyundocommand.h" +#include "../../createdxf.h" #include "../../diagram.h" +#include "../../elementprovider.h" #include "../../qetxml.h" #include "../../utils/qetutils.h" -#include "createdxf.h" -#include "elementprovider.h" #include "projectdbmodel.h" #include "qetgraphicsheaderitem.h" diff --git a/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.h b/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.h index 5f1c452e1..3503f6f6f 100644 --- a/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.h +++ b/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.h @@ -18,9 +18,10 @@ #ifndef GRAPHICSTABLEPROPERTIESEDITOR_H #define GRAPHICSTABLEPROPERTIESEDITOR_H -#include "PropertiesEditor/propertieseditorwidget.h" -#include +#include "../PropertiesEditor/propertieseditorwidget.h" + #include +#include namespace Ui { class GraphicsTablePropertiesEditor; diff --git a/sources/qetgraphicsitem/ViewItem/ui/projectdbmodelpropertieswidget.h b/sources/qetgraphicsitem/ViewItem/ui/projectdbmodelpropertieswidget.h index 067129485..de3e14850 100644 --- a/sources/qetgraphicsitem/ViewItem/ui/projectdbmodelpropertieswidget.h +++ b/sources/qetgraphicsitem/ViewItem/ui/projectdbmodelpropertieswidget.h @@ -18,7 +18,7 @@ #ifndef PROJECTDBMODELPROPERTIESWIDGET_H #define PROJECTDBMODELPROPERTIESWIDGET_H -#include "PropertiesEditor/propertieseditorwidget.h" +#include "../PropertiesEditor/propertieseditorwidget.h" class ProjectDBModel; diff --git a/sources/qetgraphicsitem/conductor.cpp b/sources/qetgraphicsitem/conductor.cpp index ea350a35a..6cbf1b79b 100644 --- a/sources/qetgraphicsitem/conductor.cpp +++ b/sources/qetgraphicsitem/conductor.cpp @@ -17,18 +17,18 @@ */ #include "../qetgraphicsitem/conductor.h" +#include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "../autoNum/numerotationcontextcommands.h" +#include "../conductorautonumerotation.h" +#include "../conductorsegment.h" +#include "../conductorsegmentprofile.h" #include "../diagram.h" +#include "../diagramcommands.h" +#include "../qetdiagrameditor.h" #include "../qetgraphicsitem/terminal.h" -#include "QPropertyUndoCommand/qpropertyundocommand.h" -#include "conductorautonumerotation.h" #include "conductorpropertiesdialog.h" -#include "conductorsegment.h" -#include "conductorsegmentprofile.h" #include "conductortextitem.h" -#include "diagramcommands.h" #include "element.h" -#include "qetdiagrameditor.h" #include #include diff --git a/sources/qetgraphicsitem/conductortextitem.cpp b/sources/qetgraphicsitem/conductortextitem.cpp index cdad14981..3ef2df397 100644 --- a/sources/qetgraphicsitem/conductortextitem.cpp +++ b/sources/qetgraphicsitem/conductortextitem.cpp @@ -18,8 +18,8 @@ #include "conductortextitem.h" #include "../diagram.h" +#include "../diagramcommands.h" #include "../qetgraphicsitem/conductor.h" -#include "diagramcommands.h" /** Constructeur diff --git a/sources/qetgraphicsitem/crossrefitem.h b/sources/qetgraphicsitem/crossrefitem.h index 1194c9967..96fac8e83 100644 --- a/sources/qetgraphicsitem/crossrefitem.h +++ b/sources/qetgraphicsitem/crossrefitem.h @@ -18,11 +18,11 @@ #ifndef CROSSREFITEM_H #define CROSSREFITEM_H -#include -#include -#include +#include "../properties/xrefproperties.h" -#include"properties/xrefproperties.h" +#include +#include +#include class Element; class DynamicElementTextItem; diff --git a/sources/qetgraphicsitem/slaveelement.h b/sources/qetgraphicsitem/slaveelement.h index 2aba4305c..bcb3e3aa5 100644 --- a/sources/qetgraphicsitem/slaveelement.h +++ b/sources/qetgraphicsitem/slaveelement.h @@ -18,8 +18,8 @@ #ifndef SLAVEELEMENT_H #define SLAVEELEMENT_H +#include "../../properties/xrefproperties.h" #include "element.h" -#include"properties/xrefproperties.h" class SlaveElement : public Element { diff --git a/sources/titleblock/helpercell.h b/sources/titleblock/helpercell.h index e2b85c37a..c12796b84 100644 --- a/sources/titleblock/helpercell.h +++ b/sources/titleblock/helpercell.h @@ -17,8 +17,9 @@ */ #ifndef TITLEBLOCK_SLASH_HELPER_CELL_H #define TITLEBLOCK_SLASH_HELPER_CELL_H +#include "../qet.h" + #include -#include "qet.h" /** This class implements a helper widget for cells that indicate the length of diff --git a/sources/titleblock/integrationmovetemplateshandler.cpp b/sources/titleblock/integrationmovetemplateshandler.cpp index e2d17fdac..d696a8d33 100644 --- a/sources/titleblock/integrationmovetemplateshandler.cpp +++ b/sources/titleblock/integrationmovetemplateshandler.cpp @@ -16,8 +16,9 @@ along with QElectroTech. If not, see . */ #include "integrationmovetemplateshandler.h" + +#include "../qetmessagebox.h" #include "templatescollection.h" -#include "qetmessagebox.h" /** Constructor diff --git a/sources/titleblock/qettemplateeditor.cpp b/sources/titleblock/qettemplateeditor.cpp index 50a82f761..4b12d5d48 100644 --- a/sources/titleblock/qettemplateeditor.cpp +++ b/sources/titleblock/qettemplateeditor.cpp @@ -16,16 +16,16 @@ along with QElectroTech. If not, see . */ #include "qettemplateeditor.h" -#include "qetmessagebox.h" -#include "qeticons.h" -#include "qetapp.h" -#include "qetproject.h" + +#include "../qetapp.h" +#include "../qeticons.h" +#include "../qetmessagebox.h" +#include "../qetproject.h" #include "templatecellwidget.h" #include "templatecommands.h" -#include "templateview.h" #include "templatelocationsaver.h" #include "templatelogomanager.h" -#include "templatecellwidget.h" +#include "templateview.h" /** @param parent parent QWidget of this window diff --git a/sources/titleblock/templatecellsset.cpp b/sources/titleblock/templatecellsset.cpp index ed76cdcdc..a24c7354d 100644 --- a/sources/titleblock/templatecellsset.cpp +++ b/sources/titleblock/templatecellsset.cpp @@ -16,12 +16,13 @@ along with QElectroTech. If not, see . */ -#include - #include "templatecellsset.h" -#include "templatevisualcell.h" + +#include "../titleblockcell.h" #include "templateview.h" -#include "titleblockcell.h" +#include "templatevisualcell.h" + +#include /** Constructor diff --git a/sources/titleblock/templatecellwidget.h b/sources/titleblock/templatecellwidget.h index 7e63749d3..2c7ac0053 100644 --- a/sources/titleblock/templatecellwidget.h +++ b/sources/titleblock/templatecellwidget.h @@ -17,8 +17,9 @@ */ #ifndef TITLEBLOCK_SLASH_TEMPLATE_CELL_WIDGET_H #define TITLEBLOCK_SLASH_TEMPLATE_CELL_WIDGET_H +#include "../qet.h" + #include -#include "qet.h" class ModifyTitleBlockCellCommand; class TitleBlockTemplate; class TitleBlockCell; diff --git a/sources/titleblock/templatecommands.cpp b/sources/titleblock/templatecommands.cpp index ee146bf2a..e67209d9a 100644 --- a/sources/titleblock/templatecommands.cpp +++ b/sources/titleblock/templatecommands.cpp @@ -16,10 +16,11 @@ along with QElectroTech. If not, see . */ #include "templatecommands.h" -#include "templatevisualcell.h" -#include "templateview.h" -#include "titleblockcell.h" + +#include "../titleblockcell.h" #include "dimension.h" +#include "templateview.h" +#include "templatevisualcell.h" #define TITLEBLOCK_DEFAULT_ROW_HEIGHT TitleBlockDimension(25) #define TITLEBLOCK_DEFAULT_COL_WIDTH TitleBlockDimension(50) diff --git a/sources/titleblock/templatecommands.h b/sources/titleblock/templatecommands.h index ef14a2b87..ef1483f3c 100644 --- a/sources/titleblock/templatecommands.h +++ b/sources/titleblock/templatecommands.h @@ -18,11 +18,12 @@ #ifndef TITLEBLOCK_SLASH_TEMPLATE_COMMANDS_H #define TITLEBLOCK_SLASH_TEMPLATE_COMMANDS_H #define MODIFY_TITLE_BLOCK_CELL_COMMAND_ID 6378 -#include -#include +#include "../titleblockcell.h" #include "dimension.h" #include "templatecellsset.h" -#include "titleblockcell.h" + +#include +#include class TitleBlockTemplateView; class TitleBlockTemplate; diff --git a/sources/titleblock/templatedeleter.cpp b/sources/titleblock/templatedeleter.cpp index 489458c62..aebbbc4d5 100644 --- a/sources/titleblock/templatedeleter.cpp +++ b/sources/titleblock/templatedeleter.cpp @@ -16,8 +16,9 @@ along with QElectroTech. If not, see . */ #include "templatedeleter.h" -#include "qetmessagebox.h" -#include "qetproject.h" + +#include "../qetmessagebox.h" +#include "../qetproject.h" /** Constructor @param tbt_location Location of the title block template to be deleted diff --git a/sources/titleblock/templatelogomanager.cpp b/sources/titleblock/templatelogomanager.cpp index e8c55da41..9694e5978 100644 --- a/sources/titleblock/templatelogomanager.cpp +++ b/sources/titleblock/templatelogomanager.cpp @@ -16,8 +16,9 @@ along with QElectroTech. If not, see . */ #include "templatelogomanager.h" -#include "titleblocktemplate.h" -#include "qeticons.h" + +#include "../qeticons.h" +#include "../titleblocktemplate.h" #include diff --git a/sources/titleblock/templateview.cpp b/sources/titleblock/templateview.cpp index c604a016e..ad6830823 100644 --- a/sources/titleblock/templateview.cpp +++ b/sources/titleblock/templateview.cpp @@ -16,14 +16,15 @@ along with QElectroTech. If not, see . */ #include "templateview.h" -#include "templatevisualcell.h" + +#include "../qeticons.h" +#include "dimensionwidget.h" #include "gridlayoutanimation.h" #include "helpercell.h" #include "splittedhelpercell.h" -#include "templatecommands.h" #include "templatecellsset.h" -#include "dimensionwidget.h" -#include "qeticons.h" +#include "templatecommands.h" +#include "templatevisualcell.h" #define ROW_OFFSET 2 #define COL_OFFSET 1 #define DEFAULT_PREVIEW_WIDTH 600 diff --git a/sources/titleblock/templateview.h b/sources/titleblock/templateview.h index 36edf14c6..d98502eed 100644 --- a/sources/titleblock/templateview.h +++ b/sources/titleblock/templateview.h @@ -17,8 +17,9 @@ */ #ifndef TITLEBLOCK_SLASH_TEMPLATE_VIEW_H #define TITLEBLOCK_SLASH_TEMPLATE_VIEW_H +#include "../titleblocktemplate.h" + #include -#include "titleblocktemplate.h" class HelperCell; class SplittedHelperCell; class TitleBlockTemplateCommand; diff --git a/sources/titleblock/templatevisualcell.cpp b/sources/titleblock/templatevisualcell.cpp index ef536de45..0367d9d27 100644 --- a/sources/titleblock/templatevisualcell.cpp +++ b/sources/titleblock/templatevisualcell.cpp @@ -18,7 +18,7 @@ #include "templatevisualcell.h" #include "../diagramcontext.h" -#include "titleblocktemplate.h" +#include "../titleblocktemplate.h" /** Constructor diff --git a/sources/titleblock/templatevisualcell.h b/sources/titleblock/templatevisualcell.h index 030019c69..ef723235b 100644 --- a/sources/titleblock/templatevisualcell.h +++ b/sources/titleblock/templatevisualcell.h @@ -17,10 +17,11 @@ */ #ifndef TITLEBLOCK_SLASH_QET_TEMPLATE_VISUAL_CELL_H #define TITLEBLOCK_SLASH_QET_TEMPLATE_VISUAL_CELL_H +#include "../qet.h" + #include -#include "qet.h" class TitleBlockTemplate; -#include "titleblockcell.h" +#include "../titleblockcell.h" /** This class implements a preview widget for cells that compose a title diff --git a/sources/ui/aboutqetdialog.cpp b/sources/ui/aboutqetdialog.cpp index ccddf29d2..49591b8b0 100644 --- a/sources/ui/aboutqetdialog.cpp +++ b/sources/ui/aboutqetdialog.cpp @@ -16,10 +16,12 @@ along with QElectroTech. If not, see . */ #include "aboutqetdialog.h" + +#include "../machine_info.h" +#include "../qet.h" +#include "../qetapp.h" #include "ui_aboutqetdialog.h" -#include "qet.h" -#include "qetapp.h" -#include "machine_info.h" + #include /** diff --git a/sources/ui/abstractelementpropertieseditorwidget.h b/sources/ui/abstractelementpropertieseditorwidget.h index 52589e9f2..5cf9f314f 100644 --- a/sources/ui/abstractelementpropertieseditorwidget.h +++ b/sources/ui/abstractelementpropertieseditorwidget.h @@ -18,7 +18,8 @@ #ifndef ABSTRACTELEMENTPROPERTIESEDITORWIDGET_H #define ABSTRACTELEMENTPROPERTIESEDITORWIDGET_H -#include "PropertiesEditor/propertieseditorwidget.h" +#include "../PropertiesEditor/propertieseditorwidget.h" + #include class Element; diff --git a/sources/ui/configpage/generalconfigurationpage.cpp b/sources/ui/configpage/generalconfigurationpage.cpp index 9b6745bc8..0b8b1fd89 100644 --- a/sources/ui/configpage/generalconfigurationpage.cpp +++ b/sources/ui/configpage/generalconfigurationpage.cpp @@ -16,13 +16,14 @@ along with QElectroTech. If not, see . */ #include "generalconfigurationpage.h" -#include "ui_generalconfigurationpage.h" -#include "qeticons.h" -#include "qetapp.h" -#include -#include +#include "../qetapp.h" +#include "../qeticons.h" +#include "ui_generalconfigurationpage.h" + #include +#include +#include /** @brief GeneralConfigurationPage::GeneralConfigurationPage diff --git a/sources/ui/configpage/generalconfigurationpage.h b/sources/ui/configpage/generalconfigurationpage.h index 9d9dd6d18..10afe5037 100644 --- a/sources/ui/configpage/generalconfigurationpage.h +++ b/sources/ui/configpage/generalconfigurationpage.h @@ -18,8 +18,9 @@ #ifndef GENERALCONFIGURATIONPAGE_H #define GENERALCONFIGURATIONPAGE_H +#include "../configpage.h" + #include -#include "configpage.h" namespace Ui { class GeneralConfigurationPage; diff --git a/sources/ui/imagepropertieswidget.h b/sources/ui/imagepropertieswidget.h index 7529fd583..3fcec56f1 100644 --- a/sources/ui/imagepropertieswidget.h +++ b/sources/ui/imagepropertieswidget.h @@ -18,7 +18,7 @@ #ifndef IMAGEPROPERTIESWIDGET_H #define IMAGEPROPERTIESWIDGET_H -#include "PropertiesEditor/propertieseditorwidget.h" +#include "../PropertiesEditor/propertieseditorwidget.h" class DiagramImageItem; diff --git a/sources/ui/inditextpropertieswidget.h b/sources/ui/inditextpropertieswidget.h index ab5a77329..f3036ee6a 100644 --- a/sources/ui/inditextpropertieswidget.h +++ b/sources/ui/inditextpropertieswidget.h @@ -18,7 +18,8 @@ #ifndef INDITEXTPROPERTIESWIDGET_H #define INDITEXTPROPERTIESWIDGET_H -#include "PropertiesEditor/propertieseditorwidget.h" +#include "../PropertiesEditor/propertieseditorwidget.h" + #include class IndependentTextItem; diff --git a/sources/ui/masterpropertieswidget.cpp b/sources/ui/masterpropertieswidget.cpp index aed09dd9c..b33ec0676 100644 --- a/sources/ui/masterpropertieswidget.cpp +++ b/sources/ui/masterpropertieswidget.cpp @@ -16,13 +16,15 @@ along with QElectroTech. If not, see . */ #include "masterpropertieswidget.h" + +#include "../diagram.h" +#include "../diagramposition.h" +#include "../elementprovider.h" +#include "element.h" +#include "linkelementcommand.h" #include "ui_masterpropertieswidget.h" + #include -#include -#include -#include -#include -#include /** @brief MasterPropertiesWidget::MasterPropertiesWidget diff --git a/sources/ui/shapegraphicsitempropertieswidget.h b/sources/ui/shapegraphicsitempropertieswidget.h index 5f7c46617..5f040bfc5 100644 --- a/sources/ui/shapegraphicsitempropertieswidget.h +++ b/sources/ui/shapegraphicsitempropertieswidget.h @@ -18,7 +18,7 @@ #ifndef SHAPEGRAPHICSITEMPROPERTIESWIDGET_H #define SHAPEGRAPHICSITEMPROPERTIESWIDGET_H -#include "PropertiesEditor/propertieseditorwidget.h" +#include "../PropertiesEditor/propertieseditorwidget.h" namespace Ui { class ShapeGraphicsItemPropertiesWidget; diff --git a/sources/undocommand/rotatetextscommand.cpp b/sources/undocommand/rotatetextscommand.cpp index c0dbc8147..8d0dad64c 100644 --- a/sources/undocommand/rotatetextscommand.cpp +++ b/sources/undocommand/rotatetextscommand.cpp @@ -18,10 +18,10 @@ #include "rotatetextscommand.h" #include "../diagram.h" +#include "../diagramcontent.h" #include "../qetapp.h" #include "../qtextorientationspinboxwidget.h" #include "conductortextitem.h" -#include "diagramcontent.h" #include "diagramtextitem.h" #include "elementtextitemgroup.h" diff --git a/sources/utils/macosxopenevent.cpp b/sources/utils/macosxopenevent.cpp index 88d010054..d1ee7a750 100644 --- a/sources/utils/macosxopenevent.cpp +++ b/sources/utils/macosxopenevent.cpp @@ -16,7 +16,9 @@ along with QElectroTech. If not, see . */ #include "macosxopenevent.h" -#include "singleapplication.h" + +#include "SingleApplication/singleapplication.h" + #include /** diff --git a/tests/catch/CMakeLists.txt b/tests/catch/CMakeLists.txt index 36280012a..3e9f6814c 100644 --- a/tests/catch/CMakeLists.txt +++ b/tests/catch/CMakeLists.txt @@ -20,13 +20,26 @@ message("_____________________________________________________________________") project(C_unittests LANGUAGES CXX) +set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) + SET(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) if(DEFINED ENV{QET_DIR}) set(QET_DIR "../..") + set(QET_COMPONENTS + Widgets + Concurrent + Xml + Svg + Network + Sql + PrintSupport + LinguistTools) message("QET_DIR is not set, assuming QET is ../..") endif() @@ -34,16 +47,21 @@ message("PROJECT_NAME: " ${PROJECT_NAME}) message("PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR}) message("QET_DIR: " ${QET_DIR}) -SET(CMAKE_CXX_STANDARD 17) +find_package( + QT + NAMES + Qt6 + Qt5 + COMPONENTS + ${QET_COMPONENTS} + REQUIRED + ) -find_package(Qt5Gui REQUIRED) -find_package(Qt5Xml REQUIRED) -find_package(Qt5Svg REQUIRED) -find_package(Qt5Sql REQUIRED) -find_package(Qt5Concurrent REQUIRED) -find_package(Qt5Widgets REQUIRED) -find_package(KF5WidgetsAddons) -find_package(KF5CoreAddons) +find_package( + Qt${QT_VERSION_MAJOR} + COMPONENTS + ${QET_COMPONENTS} + REQUIRED) Include(FetchContent) @@ -54,19 +72,30 @@ FetchContent_Declare( FetchContent_MakeAvailable(Catch2) +find_package(KF5CoreAddons REQUIRED) +#---ToDo why you don't work :/ +#FetchContent_Declare( +# kcoreaddons +# GIT_REPOSITORY https://invent.kde.org/frameworks/kcoreaddons.git +# GIT_TAG v5.76.0) +#FetchContent_MakeAvailable(kcoreaddons) +#___ToDo + +FetchContent_Declare( + kwidgetsaddons + GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git + GIT_TAG v5.76.0) + +FetchContent_MakeAvailable(kwidgetsaddons) add_executable( ${PROJECT_NAME} tst_My_test.cpp src/borderproperties_test.cpp - src/qet_test.cpp main.cpp ${QET_DIR}/sources/borderproperties.cpp ${QET_DIR}/sources/borderproperties.h - ${QET_DIR}/sources/qet.cpp - ${QET_DIR}/sources/qet.h - ${QET_DIR}/sources/qeticons.cpp - ${QET_DIR}/sources/qeticons.h) + ) target_link_libraries( ${PROJECT_NAME} @@ -79,6 +108,7 @@ target_link_libraries( Qt5::Xml Qt5::Svg Qt5::Sql + Qt5::Network Qt5::Widgets Qt5::Concurrent) diff --git a/tests/googlemock/CMakeLists.txt b/tests/googlemock/CMakeLists.txt index 44b3c3aad..32515c478 100644 --- a/tests/googlemock/CMakeLists.txt +++ b/tests/googlemock/CMakeLists.txt @@ -20,13 +20,26 @@ message("_____________________________________________________________________") project(G_unitmocktests LANGUAGES CXX) +set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) + SET(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) if(DEFINED ENV{QET_DIR}) set(QET_DIR "../..") + set(QET_COMPONENTS + Widgets + Concurrent + Xml + Svg + Network + Sql + PrintSupport + LinguistTools) message("QET_DIR is not set, assuming QET is ../..") endif() @@ -34,16 +47,21 @@ message("PROJECT_NAME: " ${PROJECT_NAME}) message("PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR}) message("QET_DIR: " ${QET_DIR}) -SET(CMAKE_CXX_STANDARD 17) +find_package( + QT + NAMES + Qt6 + Qt5 + COMPONENTS + ${QET_COMPONENTS} + REQUIRED + ) -find_package(Qt5Gui REQUIRED) -find_package(Qt5Xml REQUIRED) -find_package(Qt5Svg REQUIRED) -find_package(Qt5Sql REQUIRED) -find_package(Qt5Concurrent REQUIRED) -find_package(Qt5Widgets REQUIRED) -find_package(KF5WidgetsAddons) -find_package(KF5CoreAddons) +find_package( + Qt${QT_VERSION_MAJOR} + COMPONENTS + ${QET_COMPONENTS} + REQUIRED) Include(FetchContent) @@ -54,6 +72,22 @@ FetchContent_Declare( FetchContent_MakeAvailable(GTest) +find_package(KF5CoreAddons REQUIRED) +#---ToDo why you don't work :/ +#FetchContent_Declare( +# kcoreaddons +# GIT_REPOSITORY https://invent.kde.org/frameworks/kcoreaddons.git +# GIT_TAG v5.76.0) +#FetchContent_MakeAvailable(kcoreaddons) +#___ToDo + +FetchContent_Declare( + kwidgetsaddons + GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git + GIT_TAG v5.76.0) + +FetchContent_MakeAvailable(kwidgetsaddons) + add_executable( ${PROJECT_NAME} tst_My_test.cpp @@ -70,6 +104,7 @@ target_link_libraries( Qt5::Xml Qt5::Svg Qt5::Sql + Qt5::Network Qt5::Widgets Qt5::Concurrent) diff --git a/tests/googletest/CMakeLists.txt b/tests/googletest/CMakeLists.txt index fc8696890..f044777a2 100644 --- a/tests/googletest/CMakeLists.txt +++ b/tests/googletest/CMakeLists.txt @@ -20,13 +20,26 @@ message("_____________________________________________________________________") project(G_unittests LANGUAGES CXX) +set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) + SET(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) if(DEFINED ENV{QET_DIR}) set(QET_DIR "../..") + set(QET_COMPONENTS + Widgets + Concurrent + Xml + Svg + Network + Sql + PrintSupport + LinguistTools) message("QET_DIR is not set, assuming QET is ../..") endif() @@ -34,16 +47,21 @@ message("PROJECT_NAME: " ${PROJECT_NAME}) message("PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR}) message("QET_DIR: " ${QET_DIR}) -SET(CMAKE_CXX_STANDARD 17) +find_package( + QT + NAMES + Qt6 + Qt5 + COMPONENTS + ${QET_COMPONENTS} + REQUIRED + ) -find_package(Qt5Gui REQUIRED) -find_package(Qt5Xml REQUIRED) -find_package(Qt5Svg REQUIRED) -find_package(Qt5Sql REQUIRED) -find_package(Qt5Concurrent REQUIRED) -find_package(Qt5Widgets REQUIRED) -find_package(KF5WidgetsAddons) -find_package(KF5CoreAddons) +find_package( + Qt${QT_VERSION_MAJOR} + COMPONENTS + ${QET_COMPONENTS} + REQUIRED) Include(FetchContent) @@ -54,10 +72,27 @@ FetchContent_Declare( FetchContent_MakeAvailable(GTest) +find_package(KF5CoreAddons REQUIRED) +#---ToDo why you don't work :/ +#FetchContent_Declare( +# kcoreaddons +# GIT_REPOSITORY https://invent.kde.org/frameworks/kcoreaddons.git +# GIT_TAG v5.76.0) +#FetchContent_MakeAvailable(kcoreaddons) +#___ToDo + +FetchContent_Declare( + kwidgetsaddons + GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git + GIT_TAG v5.76.0) + +FetchContent_MakeAvailable(kwidgetsaddons) + add_executable( ${PROJECT_NAME} tst_My_test.cpp - main.cpp) + main.cpp + ) target_link_libraries( ${PROJECT_NAME} @@ -70,6 +105,7 @@ target_link_libraries( Qt5::Xml Qt5::Svg Qt5::Sql + Qt5::Network Qt5::Widgets Qt5::Concurrent) diff --git a/tests/qttest/CMakeLists.txt b/tests/qttest/CMakeLists.txt index 9e58e1ee7..6aed857ba 100644 --- a/tests/qttest/CMakeLists.txt +++ b/tests/qttest/CMakeLists.txt @@ -20,13 +20,26 @@ message("_____________________________________________________________________") project(qt_unittests LANGUAGES CXX) +set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) + SET(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) if(DEFINED ENV{QET_DIR}) set(QET_DIR "../..") + set(QET_COMPONENTS + Widgets + Concurrent + Xml + Svg + Network + Sql + PrintSupport + LinguistTools) message("QET_DIR is not set, assuming QET is ../..") endif() @@ -35,24 +48,40 @@ message("PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR}) message("QET_DIR: " ${QET_DIR}) find_package(Qt5Test REQUIRED) -find_package(Qt5Gui REQUIRED) -find_package(Qt5Xml REQUIRED) -find_package(Qt5Svg REQUIRED) -find_package(Qt5Sql REQUIRED) -find_package(Qt5Concurrent REQUIRED) -find_package(Qt5Widgets REQUIRED) -find_package(KF5WidgetsAddons) -find_package(KF5CoreAddons) +find_package( + QT + NAMES + Qt6 + Qt5 + COMPONENTS + ${QET_COMPONENTS} + REQUIRED + ) -set(CMAKE_INCLUDE_CURRENT_DIR ON) +find_package( + Qt${QT_VERSION_MAJOR} + COMPONENTS + ${QET_COMPONENTS} + REQUIRED) -set(CMAKE_AUTOUIC ON) -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) +Include(FetchContent) -SET(CMAKE_CXX_STANDARD 17) +find_package(KF5CoreAddons REQUIRED) +#---ToDo why you don't work :/ +#FetchContent_Declare( +# kcoreaddons +# GIT_REPOSITORY https://invent.kde.org/frameworks/kcoreaddons.git +# GIT_TAG v5.76.0) +#___ToDo + +FetchContent_Declare( + kwidgetsaddons + GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git + GIT_TAG v5.76.0) + +#FetchContent_MakeAvailable(kcoreaddons) +FetchContent_MakeAvailable(kwidgetsaddons) -set(CMAKE_CXX_STANDARD_REQUIRED ON) enable_testing() add_executable(${PROJECT_NAME} tst_mytest.cpp) @@ -62,13 +91,13 @@ target_link_libraries( ${PROJECT_NAME} PRIVATE Qt5::Test - KF5::WidgetsAddons KF5::CoreAddons + KF5::WidgetsAddons Qt5::Gui Qt5::Xml Qt5::Svg Qt5::Sql + Qt5::Network Qt5::Widgets - Qt5::Concurrent - ) + Qt5::Concurrent)