From a24cc61859b3280146c29579b48df4846503d70d Mon Sep 17 00:00:00 2001
From: Stephen Shelton <stephen@stephenashelton.com>
Date: Fri, 4 Oct 2019 09:41:57 -0600
Subject: [PATCH] Clean up directory structure, provide out-of-source[-ish]
 build instructions

---
 .gitignore                             | 5 +----
 README.md                              | 4 +++-
 lokicp.pro                             | 4 ++--
 TestPanel.qml => res/qml/TestPanel.qml | 0
 main.qml => res/qml/main.qml           | 0
 res/resources.qrc                      | 9 +++++++++
 resources.qrc                          | 9 ---------
 main.cpp => src/main.cpp               | 2 +-
 8 files changed, 16 insertions(+), 17 deletions(-)
 rename TestPanel.qml => res/qml/TestPanel.qml (100%)
 rename main.qml => res/qml/main.qml (100%)
 create mode 100644 res/resources.qrc
 delete mode 100644 resources.qrc
 rename main.cpp => src/main.cpp (78%)

diff --git a/.gitignore b/.gitignore
index 284f151..ef347a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,4 @@
 # build artifacts
-Makefile
-.qmake.stash
-*_qml.cpp
-lokicp
+build/
 
 tags
diff --git a/README.md b/README.md
index 570ef7d..a49cf34 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,9 @@ sudo apt install qt5-default qtdeclarative5-dev qml-module-qtquick-controls qml-
 Then build and run:
 
 ```bash
-qmake .
+mkdir build
+cd build
+qmake ../lokicp.pro "CONFIG+=debug"
 make
 ./lokicp
 ```
diff --git a/lokicp.pro b/lokicp.pro
index 3e8bdfb..2876823 100644
--- a/lokicp.pro
+++ b/lokicp.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 
 QT += qml quick widgets
 
-SOURCES += main.cpp
+SOURCES += src/main.cpp
 
-RESOURCES += resources.qrc
+RESOURCES += res/resources.qrc
 
diff --git a/TestPanel.qml b/res/qml/TestPanel.qml
similarity index 100%
rename from TestPanel.qml
rename to res/qml/TestPanel.qml
diff --git a/main.qml b/res/qml/main.qml
similarity index 100%
rename from main.qml
rename to res/qml/main.qml
diff --git a/res/resources.qrc b/res/resources.qrc
new file mode 100644
index 0000000..6086a61
--- /dev/null
+++ b/res/resources.qrc
@@ -0,0 +1,9 @@
+<RCC>
+    <qresource prefix="res/">
+        <file>qml/main.qml</file>
+        <file>qml/TestPanel.qml</file>
+    </qresource>
+    <qresource prefix="res/">
+        <file>images/icon.png</file>
+    </qresource>
+</RCC>
diff --git a/resources.qrc b/resources.qrc
deleted file mode 100644
index 852de10..0000000
--- a/resources.qrc
+++ /dev/null
@@ -1,9 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>main.qml</file>
-        <file>TestPanel.qml</file>
-    </qresource>
-    <qresource prefix="/">
-        <file>res/images/icon.png</file>
-    </qresource>
-</RCC>
diff --git a/main.cpp b/src/main.cpp
similarity index 78%
rename from main.cpp
rename to src/main.cpp
index cc31de9..026c77d 100644
--- a/main.cpp
+++ b/src/main.cpp
@@ -8,7 +8,7 @@ int32_t main(int32_t argc, char *argv[])
     QApplication app(argc, argv);
 
     QQmlApplicationEngine engine;
-    engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
+    engine.load(QUrl(QStringLiteral("qrc:/res/qml/main.qml")));
 
     return app.exec();
 }