From 1c0649db7739c9a0e4102d07fe5de7c537c431d3 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 10 May 2023 10:28:22 +0200 Subject: [PATCH] Move caf.h/cpp to UiCore --- Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt | 2 -- Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt | 2 ++ .../cafProjectDataModel/{cafPdmCore => cafPdmUiCore}/caf.cpp | 0 .../cafProjectDataModel/{cafPdmCore => cafPdmUiCore}/caf.h | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename Fwk/AppFwk/cafProjectDataModel/{cafPdmCore => cafPdmUiCore}/caf.cpp (100%) rename Fwk/AppFwk/cafProjectDataModel/{cafPdmCore => cafPdmUiCore}/caf.h (100%) diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt index 02c22933e7..b072b4b1b2 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt @@ -14,8 +14,6 @@ find_package( set(QT_LIBRARIES Qt5::Core) set(PROJECT_FILES - caf.h - caf.cpp cafAssert.h cafAppEnum.h cafClassTypeName.h diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt index 91fa8faeed..a803743e42 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt @@ -68,6 +68,8 @@ set(PROJECT_FILES cafIconProvider.h cafFontTools.cpp cafFontTools.h + caf.h + caf.cpp ) # NOTE! Resources in this subfolder appends to the variable QRC_FILES in parent diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/caf.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/caf.cpp similarity index 100% rename from Fwk/AppFwk/cafProjectDataModel/cafPdmCore/caf.cpp rename to Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/caf.cpp diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/caf.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/caf.h similarity index 100% rename from Fwk/AppFwk/cafProjectDataModel/cafPdmCore/caf.h rename to Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/caf.h