diff options
| author | Orochimarufan <orochimarufan.x3@gmail.com> | 2013-03-22 14:40:55 +0100 |
|---|---|---|
| committer | Orochimarufan <orochimarufan.x3@gmail.com> | 2013-03-22 14:40:55 +0100 |
| commit | e4f86893a899ee86cfa6d238f891bec04977c966 (patch) | |
| tree | cde559857f443d530930bce3f74eb6e64b500f52 /libsettings/include | |
| parent | cd1fdbbbc2953c5e34d8c0ae6861bec4a7f6532e (diff) | |
| download | MultiMC-e4f86893a899ee86cfa6d238f891bec04977c966.tar MultiMC-e4f86893a899ee86cfa6d238f891bec04977c966.tar.gz MultiMC-e4f86893a899ee86cfa6d238f891bec04977c966.tar.lz MultiMC-e4f86893a899ee86cfa6d238f891bec04977c966.tar.xz MultiMC-e4f86893a899ee86cfa6d238f891bec04977c966.zip | |
fix merge issues, make console window work again
Diffstat (limited to 'libsettings/include')
| -rw-r--r-- | libsettings/include/keyring.h | 5 |
1 files changed, 2 insertions, 3 deletions
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 |