reverted gpg4usb.pro

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@566 34ebc366-c3a9-4b3c-9f84-69acf7962910

3 files changed, 10 insertions, 10 deletions

diff --git a/TODO b/TODO
index 6167d9e..f49d148 100644
--- a/TODO
+++ b/TODO
@@ -20,9 +20,11 @@ Release 0.3.1
 - show, if message is partially verified(how)? [DONE]
 - replace hardcoded urls in keyserverimport (setting default keyserverlist still missing, set default in importfromkeyserverdialog) [DONE]
 - export public key on export of private key too [DONE]
+- GPLv3 [DONE]
+- cross out expired keys and add warning in key properties [DONE]
+- stealth mode for windows (http://www.portablefreeware.com/forums/viewtopic.php?f=4&t=3713) [DONE]
 - beautify icons for verify and sign
 - set gpgme error language to chosen language (context.cpp:49)
-- stealth mode for windows (http://www.portablefreeware.com/forums/viewtopic.php?f=4&t=3713)
 - import from keyserver doesn't end, if network-connection is available, but no connection to keyserver  (?)
 - keyid should be searchable in import from keyserver (?)
 
@@ -32,7 +34,6 @@ BUGS:
 Release 0.3.2
 - Change private key password (catch bad passphrase message)
 - Wizard on first start (Create Key, Import from older gpg4usb, import from gnupg)
-- GPLv3
 - css
 - key should blink short in keylist after import
 - check and add missing statusbar messages
diff --git a/gpg4usb.pro b/gpg4usb.pro
index dc3a698..e560ea6 100644
--- a/gpg4usb.pro
+++ b/gpg4usb.pro
@@ -11,8 +11,8 @@ DEPENDPATH += .
 INCLUDEPATH += . \
     ./include
 
-CONFIG += release static
-#CONFIG += debug
+#CONFIG += release static
+CONFIG += debug
 QT += network
 # Input
 HEADERS += attachments.h \
@@ -55,11 +55,12 @@ SOURCES += attachments.cpp \
 RC_FILE = gpg4usb.rc
 
 # comment out line below for static building
-#LIBS += -lgpgme \
-#     -lgpg-error \
+LIBS += -lgpgme \
+     -lgpg-error \
 
-INCLUDEPATH += ./winbuild/include 
-LIBS +=./winbuild/lib/libgpgme.a ./winbuild/lib/libgpg-error.a 
+# comment in for static buildding in windows
+#INCLUDEPATH += ./winbuild/include 
+#LIBS +=./winbuild/lib/libgpgme.a ./winbuild/lib/libgpg-error.a 
 
     
 DEFINES += _FILE_OFFSET_BITS=64
diff --git a/keylist.cpp b/keylist.cpp
index 105e371..585c707 100644
--- a/keylist.cpp
+++ b/keylist.cpp
@@ -118,7 +118,6 @@ void KeyList::refresh()
  * note: privkey status is not returned
  */
 GpgKey KeyList::getKeyByFpr(QString fpr) {
-    qDebug() << "begin of getkeybyfpr";
     GpgKey key;
     for (int i = 0; i < mKeyList->rowCount(); i++) {
         if (mKeyList->item(i, 5)->text() == fpr) {
@@ -129,7 +128,6 @@ GpgKey KeyList::getKeyByFpr(QString fpr) {
             key.fpr = fpr;
         }
     }
-    qDebug() << "end of getkeybyfpr";
     return key;
 }