From 9887c8bfb8fa6c497111876f6853b8312ee7175b Mon Sep 17 00:00:00 2001
From: crizzitello <98421672+crizzitello@users.noreply.github.com>
Date: Thu, 14 Apr 2022 14:40:01 -0400
Subject: [PATCH] Small reorder (#129)

* Remove Qt5 Builds for Windows / Mac

* Move Resources to folders

Co-authored-by: Chris Rizzitello <crizzitello@ics.com>
---
 CMakeLists.txt                |  4 ++--
 icons/res_icons.qrc           |  8 ++++++++
 migrations/res_migrations.qrc | 11 +++++++++++
 res_icons.qrc                 |  8 --------
 res_migrations.qrc            | 11 -----------
 5 files changed, 21 insertions(+), 21 deletions(-)
 create mode 100644 icons/res_icons.qrc
 create mode 100644 migrations/res_migrations.qrc
 delete mode 100644 res_icons.qrc
 delete mode 100644 res_migrations.qrc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1e92b0..d7b7f44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,8 +131,8 @@ set(ASHIRT_SOURCES
     src/porting/system_manifest.cpp src/porting/system_manifest.h
     src/porting/system_porting_options.h
     src/traymanager.cpp src/traymanager.h
-    res_icons.qrc
-    res_migrations.qrc
+    ${CMAKE_SOURCE_DIR}/icons/res_icons.qrc
+    ${CMAKE_SOURCE_DIR}/migrations/res_migrations.qrc
 )
 ## Locate the deploy app for later use
 get_target_property(qmake_executable Qt${QT_DEFAULT_MAJOR_VERSION}::qmake IMPORTED_LOCATION)
diff --git a/icons/res_icons.qrc b/icons/res_icons.qrc
new file mode 100644
index 0000000..bfcd941
--- /dev/null
+++ b/icons/res_icons.qrc
@@ -0,0 +1,8 @@
+<RCC>
+    <qresource prefix="/icons">
+        <file>shirt-dark.svg</file>
+        <file>shirt-light.svg</file>
+        <file>shirt-red.svg</file>
+        <file>windowIcon.png</file>
+    </qresource>
+</RCC>
diff --git a/migrations/res_migrations.qrc b/migrations/res_migrations.qrc
new file mode 100644
index 0000000..2f086fd
--- /dev/null
+++ b/migrations/res_migrations.qrc
@@ -0,0 +1,11 @@
+<RCC>
+    <qresource prefix="/migrations">
+        <file>20200521190124-initial.sql</file>
+        <file>20200521210407-add-screenshots-table.sql</file>
+        <file>20200521210435-add-tags-table.sql</file>
+        <file>20200625191727-support-codeblocks-p1.sql</file>
+        <file>20200625192018-support-codeblocks-p2.sql</file>
+        <file>20200625192444-support-codeblocks-p3.sql</file>
+        <file>20200625203249-support-codeblocks-p4.sql</file>
+    </qresource>
+</RCC>
diff --git a/res_icons.qrc b/res_icons.qrc
deleted file mode 100644
index add5b55..0000000
--- a/res_icons.qrc
+++ /dev/null
@@ -1,8 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>icons/shirt-dark.svg</file>
-        <file>icons/shirt-light.svg</file>
-        <file>icons/shirt-red.svg</file>
-        <file>icons/windowIcon.png</file>
-    </qresource>
-</RCC>
diff --git a/res_migrations.qrc b/res_migrations.qrc
deleted file mode 100644
index d960e7e..0000000
--- a/res_migrations.qrc
+++ /dev/null
@@ -1,11 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>migrations/20200521190124-initial.sql</file>
-        <file>migrations/20200521210407-add-screenshots-table.sql</file>
-        <file>migrations/20200521210435-add-tags-table.sql</file>
-        <file>migrations/20200625191727-support-codeblocks-p1.sql</file>
-        <file>migrations/20200625192018-support-codeblocks-p2.sql</file>
-        <file>migrations/20200625192444-support-codeblocks-p3.sql</file>
-        <file>migrations/20200625203249-support-codeblocks-p4.sql</file>
-    </qresource>
-</RCC>
\ No newline at end of file