fix merge issues, make console window work again

2013-03-22 14:40:55 +01:00
parent cd1fdbbbc2
commit e4f86893a8
9 changed files with 164 additions and 152 deletions
--- a/libsettings/src/stubkeyring.h
+++ b/libsettings/src/stubkeyring.h
@ -24,7 +24,6 @@

 class StubKeyring : public Keyring
 {
-	Q_OBJECT
 public:
 	virtual bool storePassword(QString service, QString username, QString password);
 	virtual QString getPassword(QString service, QString username);