diff options
| author | ubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910> | 2012-08-02 08:52:16 +0000 |
|---|---|---|
| committer | ubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910> | 2012-08-02 08:52:16 +0000 |
| commit | 36ed8ee1b9f3a34b942bf640ac1d4e888ff261ba (patch) | |
| tree | bf1c390bf69dd1a21e6803d89fe4ab37200ded18 | |
| parent | lots of classes from kgpg, keylist works now (diff) | |
| download | gpg4usb-36ed8ee1b9f3a34b942bf640ac1d4e888ff261ba.tar.gz gpg4usb-36ed8ee1b9f3a34b942bf640ac1d4e888ff261ba.zip | |
mac fixes
git-svn-id: http://cpunk.de/svn/src/gpg4usb/branches/0.3.2-mac@924 34ebc366-c3a9-4b3c-9f84-69acf7962910
| -rw-r--r-- | gpg4usb.pro | 4 | ||||
| -rw-r--r-- | kgpg/gpgproc.cpp | 17 |
2 files changed, 13 insertions, 8 deletions
diff --git a/gpg4usb.pro b/gpg4usb.pro index 2c487a1..f82b9d9 100644 --- a/gpg4usb.pro +++ b/gpg4usb.pro @@ -13,9 +13,9 @@ INCLUDEPATH += . \ #DEFINES += GPG4USB_NON_PORTABLE -#CONFIG += release static +CONFIG += release static #CONFIG += release -CONFIG += debug +#CONFIG += debug QT += network # Input diff --git a/kgpg/gpgproc.cpp b/kgpg/gpgproc.cpp index 8ed8b45..b308ab5 100644 --- a/kgpg/gpgproc.cpp +++ b/kgpg/gpgproc.cpp @@ -168,7 +168,7 @@ GPGProc::resetProcess(const QString &binary) gpgBin = appPath + "/bin/gpg.exe"; #endif #ifdef Q_WS_MAC - gpgBin = appPath + "/bin/gpg-mac.app"; + gpgBin = appPath + "/gpg-mac"; #endif #ifdef Q_WS_X11 gpgBin = appPath + "/bin/gpg"; @@ -179,7 +179,7 @@ GPGProc::resetProcess(const QString &binary) if (bin->binary() != executable) bin->setBinary(executable); - + qDebug() << "ex: " << executable; setProgram(executable, bin->standardArguments()); setOutputChannelMode(OnlyStdoutChannel); @@ -294,14 +294,19 @@ QString GPGProc::gpgVersionString(const QString &binary) process.start(); process.waitForFinished(-1); - if (process.exitCode() == 255) + if (process.exitCode() == 255) { + qDebug() << "exit255"; return QString(); + } QString line; - if (process.readln(line) != -1) - return line.simplified().section(QLatin1Char( ' ' ), -1); - else + if (process.readln(line) != -1) { + qDebug() << line; + return line.simplified().section(QLatin1Char( ' ' ), -1); + } else { + qDebug() << "no readln"; return QString(); + } } QString GPGProc::getGpgStartupError(const QString &binary) |