diff options
| author | ubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910> | 2014-05-01 22:12:45 +0000 |
|---|---|---|
| committer | ubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910> | 2014-05-01 22:12:45 +0000 |
| commit | 6deec9eef945b9b2d30e295308c62290b2b0b0a2 (patch) | |
| tree | b02f726611c9040ba84e927215fd7c55bae76b9a | |
| parent | merge 0.4-beta branch into trunk after removing qdebugs (diff) | |
| download | gpg4usb-6deec9eef945b9b2d30e295308c62290b2b0b0a2.tar.gz gpg4usb-6deec9eef945b9b2d30e295308c62290b2b0b0a2.zip | |
debug on win
git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@1104 34ebc366-c3a9-4b3c-9f84-69acf7962910
| -rw-r--r-- | gpg4usb.pro | 4 | ||||
| -rw-r--r-- | kgpg/kprocess.cpp | 2 | ||||
| -rw-r--r-- | kgpg/transactions/kgpgtransaction.cpp | 4 | ||||
| -rw-r--r-- | mainwindow.cpp | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/gpg4usb.pro b/gpg4usb.pro index 300d112..dfa3e8b 100644 --- a/gpg4usb.pro +++ b/gpg4usb.pro @@ -14,6 +14,10 @@ INCLUDEPATH += . #DEFINES += QT_NO_DEBUG_OUTPUT QT_NO_WARNING_OUTPUT CONFIG += release static + +# qdebug on windows +CONFIG += console + #CONFIG += release #CONFIG += debug diff --git a/kgpg/kprocess.cpp b/kgpg/kprocess.cpp index ba71ebd..907c75c 100644 --- a/kgpg/kprocess.cpp +++ b/kgpg/kprocess.cpp @@ -341,7 +341,7 @@ QStringList KProcess::program() const void KProcess::start() { Q_D(KProcess); - //qDebug() << "prog: " << d->prog << " | args: " << d->args; + qDebug() << "prog: " << d->prog << " | args: " << d->args; QProcess::start(d->prog, d->args, d->openMode); } diff --git a/kgpg/transactions/kgpgtransaction.cpp b/kgpg/transactions/kgpgtransaction.cpp index ba8c5aa..003c33d 100644 --- a/kgpg/transactions/kgpgtransaction.cpp +++ b/kgpg/transactions/kgpgtransaction.cpp @@ -87,7 +87,7 @@ KGpgTransactionPrivate::slotReadReady() #ifdef KGPG_DEBUG_TRANSACTIONS qDebug() << m_parent << line; #endif /* KGPG_DEBUG_TRANSACTIONS */ - //qDebug() << "trans-read: " << m_parent << line; + qDebug() << "trans-read: " << m_parent << line; if (line.startsWith(QLatin1String("[GNUPG:] USERID_HINT "))) { @@ -215,7 +215,7 @@ KGpgTransactionPrivate::write(const QByteArray &a) #ifdef KGPG_DEBUG_TRANSACTIONS qDebug() << m_parent << a; #endif /* KGPG_DEBUG_TRANSACTIONS */ - //qDebug() << "trans-write: " << m_parent << a; + qDebug() << "trans-write: " << m_parent << a; } void diff --git a/mainwindow.cpp b/mainwindow.cpp index 16a2d3f..cacc8ca 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1074,7 +1074,7 @@ void MainWindow::slotDecryptDone(int result) if (result == KGpgTransaction::TS_OK) { // FIXME choose codec //setPlainText(decr->decryptedText().join(QLatin1String("\n")) + QLatin1Char('\n')); - edit->slotFillTextEditWithText(decr->decryptedText().join(QLatin1String("\n")) + QLatin1Char('\n')); + edit->slotFillTextEditWithText(decr->decryptedText().join(QLatin1String("\n")) + QLatin1String("\n")); } else if (result != KGpgTransaction::TS_USER_ABORTED) { //KMessageBox::detailedSorry(this, i18n("Decryption failed."), decr->getMessages().join( QLatin1String( "\n" ))); qDebug() << "Decryption failed." << decr->getMessages().join( QLatin1String( "\n" )); |