From e4f86893a899ee86cfa6d238f891bec04977c966 Mon Sep 17 00:00:00 2001
From: Orochimarufan <orochimarufan.x3@gmail.com>
Date: Fri, 22 Mar 2013 14:40:55 +0100
Subject: fix merge issues, make console window work again

---
 libsettings/include/keyring.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'libsettings/include')

diff --git a/libsettings/include/keyring.h b/libsettings/include/keyring.h
index afdc3bba..5774e287 100644
--- a/libsettings/include/keyring.h
+++ b/libsettings/include/keyring.h
@@ -18,7 +18,7 @@
 #ifndef KEYRING_H
 #define KEYRING_H
 
-#include <QObject>
+#include <QString>
 
 #include "libsettings_config.h"
 
@@ -31,9 +31,8 @@
  * @brief The Keyring class
  * the System Keyring/Keychain/Wallet/Vault/etc
  */
-class LIBMMCSETTINGS_EXPORT Keyring : public QObject
+class LIBSETTINGS_EXPORT Keyring
 {
-	Q_OBJECT
 public:
 	/**
 	 * @brief the System Keyring instance
-- 
cgit v1.2.3