From 795f30f7aff0765d1f0639f58c68b25c727883e9 Mon Sep 17 00:00:00 2001
From: Alexander Almaleh <sashoalm@gmail.com>
Date: Sun, 13 Aug 2017 15:30:08 +0300
Subject: [PATCH] Fix failure to load certificate in cmd line project.

The certificate was only available in the GUI project.
---
 QFtpServer/QFtpServer.pro                 | 1 -
 QFtpServer/res.qrc                        | 4 ----
 QFtpServerLib/QFtpServerLib.pro           | 3 +++
 {QFtpServer => QFtpServerLib}/cacert.pem  | 0
 QFtpServerLib/certificates.qrc            | 6 ++++++
 {QFtpServer => QFtpServerLib}/privkey.pem | 0
 6 files changed, 9 insertions(+), 5 deletions(-)
 rename {QFtpServer => QFtpServerLib}/cacert.pem (100%)
 create mode 100644 QFtpServerLib/certificates.qrc
 rename {QFtpServer => QFtpServerLib}/privkey.pem (100%)

diff --git a/QFtpServer/QFtpServer.pro b/QFtpServer/QFtpServer.pro
index bdbf44e..ef8d8b3 100644
--- a/QFtpServer/QFtpServer.pro
+++ b/QFtpServer/QFtpServer.pro
@@ -40,7 +40,6 @@ RESOURCES += \
     res.qrc
 
 OTHER_FILES += \
-    privkey.pem \
     cacert.pem \
     android/AndroidManifest.xml
 
diff --git a/QFtpServer/res.qrc b/QFtpServer/res.qrc
index 9afc2ac..8536ed9 100644
--- a/QFtpServer/res.qrc
+++ b/QFtpServer/res.qrc
@@ -1,8 +1,4 @@
 <RCC>
-    <qresource prefix="/ssl">
-        <file>cacert.pem</file>
-        <file>privkey.pem</file>
-    </qresource>
     <qresource prefix="/icons">
         <file alias="appicon">android/res/drawable-hdpi/icon.png</file>
     </qresource>
diff --git a/QFtpServerLib/QFtpServerLib.pro b/QFtpServerLib/QFtpServerLib.pro
index 565dc18..b7d2992 100644
--- a/QFtpServerLib/QFtpServerLib.pro
+++ b/QFtpServerLib/QFtpServerLib.pro
@@ -38,3 +38,6 @@ unix {
     target.path = /usr/lib
     INSTALLS += target
 }
+
+RESOURCES += \
+    certificates.qrc
diff --git a/QFtpServer/cacert.pem b/QFtpServerLib/cacert.pem
similarity index 100%
rename from QFtpServer/cacert.pem
rename to QFtpServerLib/cacert.pem
diff --git a/QFtpServerLib/certificates.qrc b/QFtpServerLib/certificates.qrc
new file mode 100644
index 0000000..eeb0c27
--- /dev/null
+++ b/QFtpServerLib/certificates.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/ssl">
+        <file>cacert.pem</file>
+        <file>privkey.pem</file>
+    </qresource>
+</RCC>
diff --git a/QFtpServer/privkey.pem b/QFtpServerLib/privkey.pem
similarity index 100%
rename from QFtpServer/privkey.pem
rename to QFtpServerLib/privkey.pem