moved qml types into models folder

disorderedmaterials · May 13, 2024 · f558ee2 · f558ee2
1 parent ef46049
commit f558ee2
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 12 deletions.
diff --git a/src/dissolve-gui-qml.cpp b/src/dissolve-gui-qml.cpp
@@ -4,7 +4,7 @@
 #include "base/messenger.h"
 #include "base/processPool.h"
 #include "gui/models/dissolveModel.h"
-#include "gui/types.h"
+#include "gui/models/types.h"
 #include "main/cli.h"
 #include "main/dissolve.h"
 #include "main/version.h"

diff --git a/src/dissolve-gui.cpp b/src/dissolve-gui.cpp
@@ -4,7 +4,7 @@
 #include "base/messenger.h"
 #include "base/processPool.h"
 #include "gui/gui.h"
-#include "gui/types.h"
+#include "gui/models/types.h"
 #include "main/cli.h"
 #include "main/dissolve.h"
 #include "main/version.h"

diff --git a/src/gui-qml/CMakeLists.txt b/src/gui-qml/CMakeLists.txt
@@ -1,9 +1,5 @@
 # Target 'gui'
-add_library(
-  gui-qml
-  # Types for QML access
-  ../gui/types.cpp
-)
+add_library(gui-qml)
 
 target_include_directories(
   gui-qml

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -169,9 +169,6 @@ add_library(
   stockColours.h
   thread.cpp
   thread.h
-  # QML type register
-  types.cpp
-  types.h
 )
 
 target_include_directories(

diff --git a/src/gui/models/CMakeLists.txt b/src/gui/models/CMakeLists.txt
@@ -149,13 +149,24 @@ qt6_wrap_cpp(
   xmlTorsionModel.h
 )
 
-add_library(models ${models_SRCS} ${models_MOC_SRCS})
+set(
+  # QML type register
+  types_SRCS
+  types.h
+  types.cpp
+)
+
+find_package(Qt6 REQUIRED COMPONENTS Core Qml)
+
+add_library(models ${models_SRCS} ${models_MOC_SRCS} ${types_SRCS})
 
 target_include_directories(
   models PRIVATE ${PROJECT_SOURCE_DIR}/src ${PROJECT_BINARY_DIR}/src ${CONAN_INCLUDE_DIRS_PUGIXML} ${Qt6Widgets_INCLUDE_DIRS}
                  ${FREETYPE_INCLUDE_DIRS} ${Qt6Quick_INCLUDE_DIRS}
 )
 
+target_link_libraries(models PRIVATE Qt6::Core Qt6::Qml)
+
 # Because Qt has its own way of checking for C++17
 if(MSVC)
   target_compile_options(models PUBLIC /Zc:__cplusplus)

diff --git a/src/gui/types.cpp → src/gui/models/types.cpp b/src/gui/types.cpp → src/gui/models/types.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 // Copyright (c) 2024 Team Dissolve and contributors
 
-#include "gui/types.h"
+#include "gui/models/types.h"
 #include "gui/models/addForcefieldDialogModel.h"
 #include "gui/models/atomTypeModel.h"
 #include "gui/models/configurationModel.h"

diff --git a/src/gui/types.h → src/gui/models/types.h b/src/gui/types.h → src/gui/models/types.h