Skip to content

Commit 795f30f

Browse files
committedAug 13, 2017
Fix failure to load certificate in cmd line project.
The certificate was only available in the GUI project.
1 parent 7878a58 commit 795f30f

File tree

6 files changed

+9
-5
lines changed

6 files changed

+9
-5
lines changed
 

‎QFtpServer/QFtpServer.pro

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ RESOURCES += \
4040
res.qrc
4141

4242
OTHER_FILES += \
43-
privkey.pem \
4443
cacert.pem \
4544
android/AndroidManifest.xml
4645

‎QFtpServer/res.qrc

-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
<RCC>
2-
<qresource prefix="/ssl">
3-
<file>cacert.pem</file>
4-
<file>privkey.pem</file>
5-
</qresource>
62
<qresource prefix="/icons">
73
<file alias="appicon">android/res/drawable-hdpi/icon.png</file>
84
</qresource>

‎QFtpServerLib/QFtpServerLib.pro

+3
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,6 @@ unix {
3838
target.path = /usr/lib
3939
INSTALLS += target
4040
}
41+
42+
RESOURCES += \
43+
certificates.qrc
File renamed without changes.

‎QFtpServerLib/certificates.qrc

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<RCC>
2+
<qresource prefix="/ssl">
3+
<file>cacert.pem</file>
4+
<file>privkey.pem</file>
5+
</qresource>
6+
</RCC>
File renamed without changes.

0 commit comments

Comments
 (0)