diff options
Diffstat (limited to 'pica-client')
| -rw-r--r-- | pica-client/dialogs/viewcertdialog.cpp | 4 | ||||
| -rw-r--r-- | pica-client/main.cpp | 10 | ||||
| -rw-r--r-- | pica-client/openssltool.cpp | 3 |
3 files changed, 12 insertions, 5 deletions
diff --git a/pica-client/dialogs/viewcertdialog.cpp b/pica-client/dialogs/viewcertdialog.cpp index 7a41401..f75e7f3 100644 --- a/pica-client/dialogs/viewcertdialog.cpp +++ b/pica-client/dialogs/viewcertdialog.cpp @@ -2,10 +2,6 @@ #include "../openssltool.h" #include <QVBoxLayout> #include <QMessageBox> - -#include <unistd.h> -#include <stdio.h> -#include <sys/wait.h> #include <QFile> ViewCertDialog::ViewCertDialog(QWidget *parent) : diff --git a/pica-client/main.cpp b/pica-client/main.cpp index 184e73b..9a71a43 100644 --- a/pica-client/main.cpp +++ b/pica-client/main.cpp @@ -29,7 +29,11 @@ class PicaSysTray *systray; // /usr/share/pica-client/pica-pica_CA.pem //QString config_defaultCA("/home/root_jr/files/projects/picapica_wc/localhost/project_picapica/trunk/tests/trusted_CA.pem"); +#ifndef WIN32 QString config_defaultCA(PICA_INSTALLPREFIX"/share/pica-client/CA.pem"); +#else +QString config_defaultCA("share\\CA.pem"); +#endif static bool create_config_dir() { @@ -134,9 +138,13 @@ int main(int argc, char *argv[]) if (!create_config_dir()) return -1; - +#ifndef WIN32 picapica_ico_sit = QIcon(PICA_INSTALLPREFIX"/share/pica-client/picapica-icon-sit.png"); picapica_ico_fly = QIcon(PICA_INSTALLPREFIX"/share/pica-client/picapica-icon-fly.png"); +#else + picapica_ico_sit = QIcon("share\\picapica-icon-sit.png"); + picapica_ico_fly = QIcon("share\\picapica-icon-fly.png"); +#endif PicaActionCenter ac; action_center = ∾ diff --git a/pica-client/openssltool.cpp b/pica-client/openssltool.cpp index 29cb3b7..2c19223 100644 --- a/pica-client/openssltool.cpp +++ b/pica-client/openssltool.cpp @@ -102,6 +102,9 @@ bool OpenSSLTool::GenCSRSignal(QString csr_file, QString keyfile, QString subjec openssl_.start("openssl", QStringList() <<"req" +#ifdef WIN32 + <<"-config"<<"openssl.cnf" +#endif <<"-out"<<csr_file <<"-key"<<keyfile <<"-subj"<<"/CN=" + subject |