Fix failure to load certificate in cmd line project.

The certificate was only available in the GUI project.
sashoalm · Aug 13, 2017 · 795f30f · 795f30f
1 parent 7878a58
commit 795f30f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git 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
@@ -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
@@ -38,3 +38,6 @@ unix {
     target.path = /usr/lib
     INSTALLS += target
 }
+
+RESOURCES += \
+    certificates.qrc
diff --git a/QFtpServer/cacert.pem → QFtpServerLib/cacert.pem b/QFtpServer/cacert.pem → QFtpServerLib/cacert.pem
diff --git a/QFtpServerLib/certificates.qrc 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 → QFtpServerLib/privkey.pem b/QFtpServer/privkey.pem → QFtpServerLib/privkey.pem